1013 files changed, 29546 insertions, 30584 deletions

diff --git a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF
index a1a5c31bcad..3369582e04b 100644
--- a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF
+++ b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.1.0",
  org.eclipse.gmf.runtime.diagram.core;bundle-version="1.7.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.1.0",
diff --git a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/plugin.xml b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/plugin.xml
index ae7debd6d48..958540a68a5 100644
--- a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/plugin.xml
+++ b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/plugin.xml
@@ -24,16 +24,16 @@
       </menuCreationModel>
    </extension>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.effbd.elementTypeSet"
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="resource/EFFB.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.effbd.graphicalelementTypeSet"
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="resource/GraphicalEFFB.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
diff --git a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/EFFB.elementtypesconfigurations b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/EFFB.elementtypesconfigurations
index 9758098619e..6d6525229d6 100644
--- a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/EFFB.elementtypesconfigurations
+++ b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/EFFB.elementtypesconfigurations
@@ -1,250 +1,93 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
-    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
-    xmi:id="_k4SmgLwFEeSwNLK2W02HwA"
-    name="EFFB"
-    description="EFFB extension element type set"
-    identifier="org.eclipse.papyrus.effb.elementTypes"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_e5fIUJz6EeWAbLfn_iCQ6g"
-      name="Function"
-      description="Create a function"
-      identifier="org.eclipse.papyrus.effbd.function">
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_TbuPEJz7EeWAbLfn_iCQ6g"
-        name="FunctionAdvice"
-        identifier="org.eclipse.papyrus.effbd.advice.FunctionEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.FunctionEditHelperAdvice"/>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_xbhKsKM9EeWq3orFSZ8l-w">
-      <stereotypesQualifiedNames>EFFBProfile::Function</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_-YNlwJ0KEeW4i7v9QEMhZg"
-      name="an Enhanced Function Flow Block"
-      description="create an Enhanced Function Flow Block"
-      identifier="org.eclipse.papyrus.effbd.effb">
-    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_tk8ncJ0LEeW4i7v9QEMhZg"
-        name="EFFBAdvice"
-        identifier="org.eclipse.papyrus.effbd.advice.EFFBEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.EFFBEditHelperAdvice"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_-CRUMJ55EeWHhcFWyAfOIA"
-      name="Input data"
-      identifier="org.eclipse.papyrus.effbd.inputdata">
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_qLlxwJ6GEeWHhcFWyAfOIA"
-        name="set as input"
-        identifier="org.eclipse.papyrus.effbd.advice.InputDataEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.InputDataEditHelperAdvice"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_NqniEJ56EeWHhcFWyAfOIA"
-      name="Output Data"
-      identifier="org.eclipse.papyrus.effbd.outputdata">
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_eU8pAJ6IEeWHhcFWyAfOIA"
-        name="set as input"
-        identifier="org.eclipse.papyrus.effbd.advice.OutputDataEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.OutputDataEditHelperAdvice"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_uko5gKJTEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.orbegin"
-      description="OR operator"
-      identifier="org.eclipse.papyrus.effbd.orbegin">
-    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_Fo1YkKM-EeWq3orFSZ8l-w">
-      <stereotypesQualifiedNames>EFFBProfile::ORBegin</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_L4dY4KJUEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.orend"
-      description="OR operator"
-      identifier="org.eclipse.papyrus.effbd.orend">
-    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_EBgJEKJnEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.andbegin"
-      description="AND operator"
-      identifier="org.eclipse.papyrus.effbd.andbegin">
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_FYApAKJnEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.andend"
-      description="AND operator"
-      identifier="org.eclipse.papyrus.effbd.andend">
-    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_vXOxEKJ0EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.itbegin"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.itbegin">
-    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_wjESEKJ0EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.itend"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.itend">
-    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_-Lb9gKJ6EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.lpbegin"
-      description="LP operator"
-      identifier="org.eclipse.papyrus.effbd.lpbegin">
-    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_-Lb9gaJ6EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.lpend"
-      description="LP operator"
-      identifier="org.eclipse.papyrus.effbd.lpend">
-    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_do1VIKJSEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.functionstereotypeadvice"
-      identifier="org.eclipse.papyrus.effbd.functionstereotypeadvice"
-      target="_e5fIUJz6EeWAbLfn_iCQ6g">
-    <stereotypesToApply
-        xmi:id="_mAQ6IKJSEeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::Function">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="__66BwKJTEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.orbeginstereotypeadvice"
-      identifier="org.eclipse.papyrus.effbd.orbeginstereotypeadvice"
-      target="_uko5gKJTEeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_I_hc4KJUEeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::ORBegin">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_Rc6f8KJUEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.orendstereotypeadvice"
-      description=""
-      identifier="org.eclipse.papyrus.effbd.orendstereotypeadvice"
-      target="_L4dY4KJUEeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_Rc6f8aJUEeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::OREnd">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_Ua8csKJnEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.andbeginstereotypeadvice"
-      identifier="org.eclipse.papyrus.effbd.andbeginstereotypeadvice"
-      target="_EBgJEKJnEeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_Ua8csaJnEeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::ANDBegin">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_Ua8csqJnEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.andendstereotypeadvice"
-      description=""
-      identifier="org.eclipse.papyrus.effbd.andendstereotypeadvice"
-      target="_FYApAKJnEeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_Ua8cs6JnEeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::ANDEnd">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_Q5P5wKJ2EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.itbeginstereotypeadvice"
-      identifier="org.eclipse.papyrus.effbd.itbeginstereotypeadvice"
-      target="_vXOxEKJ0EeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_Q5P5waJ2EeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::ITBegin">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_Q5P5wqJ2EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.itendstereotypeadvice"
-      description=""
-      identifier="org.eclipse.papyrus.effbd.itendstereotypeadvice"
-      target="_wjESEKJ0EeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_Q5P5w6J2EeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::ITEnd">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_JpCpQKJ7EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.lpbeginstereotypeadvice"
-      identifier="org.eclipse.papyrus.effbd.lpbeginstereotypeadvice"
-      target="_-Lb9gKJ6EeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_JpCpQaJ7EeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::LPBegin">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_JpCpQqJ7EeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.lpendstereotypeadvice"
-      description=""
-      identifier="org.eclipse.papyrus.effbd.lpendstereotypeadvice"
-      target="_-Lb9gaJ6EeWBS5oHY8K2yw">
-    <stereotypesToApply
-        xmi:id="_JpCpQ6J7EeWBS5oHY8K2yw"
-        stereotypeQualifiedName="EFFBProfile::LPEnd">
-      <requiredProfiles>EFFBProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?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" description="EFFB extension element type set" identifier="org.eclipse.papyrus.effb.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="EFFB" xmi:id="_k4SmgLwFEeSwNLK2W02HwA" xmi:version="2.0">

+  <elementTypeConfigurations description="Create a function" identifier="org.eclipse.papyrus.effbd.function" name="Function" xmi:id="_e5fIUJz6EeWAbLfn_iCQ6g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.FunctionEditHelperAdvice" xmi:id="_TbuPEJz7EeWAbLfn_iCQ6g" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration xmi:id="_xbhKsKM9EeWq3orFSZ8l-w" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>EFFBProfile::Function</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="create an Enhanced Function Flow Block" identifier="org.eclipse.papyrus.effbd.effb" name="an Enhanced Function Flow Block" xmi:id="_-YNlwJ0KEeW4i7v9QEMhZg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.EFFBEditHelperAdvice" xmi:id="_tk8ncJ0LEeW4i7v9QEMhZg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.effbd.inputdata" name="Input data" xmi:id="_-CRUMJ55EeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.InputDataEditHelperAdvice" xmi:id="_qLlxwJ6GEeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.effbd.outputdata" name="Output Data" xmi:id="_NqniEJ56EeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.effbd.advice.OutputDataEditHelperAdvice" xmi:id="_eU8pAJ6IEeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="OR operator" identifier="org.eclipse.papyrus.effbd.orbegin" name="org.eclipse.papyrus.effbd.orbegin" xmi:id="_uko5gKJTEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_Fo1YkKM-EeWq3orFSZ8l-w" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>EFFBProfile::ORBegin</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="OR operator" identifier="org.eclipse.papyrus.effbd.orend" name="org.eclipse.papyrus.effbd.orend" xmi:id="_L4dY4KJUEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="AND operator" identifier="org.eclipse.papyrus.effbd.andbegin" name="org.eclipse.papyrus.effbd.andbegin" xmi:id="_EBgJEKJnEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="AND operator" identifier="org.eclipse.papyrus.effbd.andend" name="org.eclipse.papyrus.effbd.andend" xmi:id="_FYApAKJnEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="IT operator" identifier="org.eclipse.papyrus.effbd.itbegin" name="org.eclipse.papyrus.effbd.itbegin" xmi:id="_vXOxEKJ0EeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="IT operator" identifier="org.eclipse.papyrus.effbd.itend" name="org.eclipse.papyrus.effbd.itend" xmi:id="_wjESEKJ0EeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="LP operator" identifier="org.eclipse.papyrus.effbd.lpbegin" name="org.eclipse.papyrus.effbd.lpbegin" xmi:id="_-Lb9gKJ6EeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="LP operator" identifier="org.eclipse.papyrus.effbd.lpend" name="org.eclipse.papyrus.effbd.lpend" xmi:id="_-Lb9gaJ6EeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.effbd.functionstereotypeadvice" target="_e5fIUJz6EeWAbLfn_iCQ6g" xmi:id="_do1VIKJSEeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::Function" xmi:id="_mAQ6IKJSEeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.effbd.orbeginstereotypeadvice" target="_uko5gKJTEeWBS5oHY8K2yw" xmi:id="__66BwKJTEeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::ORBegin" xmi:id="_I_hc4KJUEeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="" identifier="org.eclipse.papyrus.effbd.orendstereotypeadvice" target="_L4dY4KJUEeWBS5oHY8K2yw" xmi:id="_Rc6f8KJUEeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::OREnd" xmi:id="_Rc6f8aJUEeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.effbd.andbeginstereotypeadvice" target="_EBgJEKJnEeWBS5oHY8K2yw" xmi:id="_Ua8csKJnEeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::ANDBegin" xmi:id="_Ua8csaJnEeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="" identifier="org.eclipse.papyrus.effbd.andendstereotypeadvice" target="_FYApAKJnEeWBS5oHY8K2yw" xmi:id="_Ua8csqJnEeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::ANDEnd" xmi:id="_Ua8cs6JnEeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.effbd.itbeginstereotypeadvice" target="_vXOxEKJ0EeWBS5oHY8K2yw" xmi:id="_Q5P5wKJ2EeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::ITBegin" xmi:id="_Q5P5waJ2EeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="" identifier="org.eclipse.papyrus.effbd.itendstereotypeadvice" target="_wjESEKJ0EeWBS5oHY8K2yw" xmi:id="_Q5P5wqJ2EeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::ITEnd" xmi:id="_Q5P5w6J2EeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.effbd.lpbeginstereotypeadvice" target="_-Lb9gKJ6EeWBS5oHY8K2yw" xmi:id="_JpCpQKJ7EeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::LPBegin" xmi:id="_JpCpQaJ7EeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="" identifier="org.eclipse.papyrus.effbd.lpendstereotypeadvice" target="_-Lb9gaJ6EeWBS5oHY8K2yw" xmi:id="_JpCpQqJ7EeWBS5oHY8K2yw" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="EFFBProfile::LPEnd" xmi:id="_JpCpQ6J7EeWBS5oHY8K2yw">

+      <requiredProfiles>EFFBProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations
index aebf2ce9606..622b8691af9 100644
--- a/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations
+++ b/extraplugins/EFFBD/org.eclipse.papyrus.effbd/resource/GraphicalEFFB.elementtypesconfigurations
@@ -1,126 +1,47 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
-    xmi:id="_k4SmgLwFEeSwNLK2W02HwA"
-    name="EFFB"
-    description="EFFB extension element type set"
-    identifier="org.eclipse.papyrus.effb.elementTypes"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_kGRHgJ0AEeW4i7v9QEMhZg"
-      name="org.eclipse.papyrus.effbd.graphicalfunction"
-      description="Create a function on the diagram"
-      identifier="org.eclipse.papyrus.effbd.graphicalfunction"
-      hint="3007">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.function</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_79MooJ56EeWHhcFWyAfOIA"
-      name="Input Data node"
-      identifier="org.eclipse.papyrus.effbd.inputdata_node"
-      hint="inputdata_node">
-    <specializedTypesID>org.eclipse.papyrus.effbd.inputdata</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_WtGt4J6IEeWHhcFWyAfOIA"
-      name="Output Data node"
-      identifier="org.eclipse.papyrus.effbd.outputdata_node"
-      hint="outputdata_node">
-    <specializedTypesID>org.eclipse.papyrus.effbd.outputdata</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_K6I1AKAbEeWbYYB8YU_3Xg"
-      name="a body for the opaqueAction"
-      identifier="org.eclipse.papyrus.effbd.opaqueAction_body"
-      hint="opaqueAction_body">
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="__fIUoKJnEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalorbegin"
-      description="OR operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalorbegin"
-      hint="3038">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.orbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_R6uGMKJoEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalorEnd"
-      description="OR operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalorEnd"
-      hint="3039">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.orend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_vCnM8KJpEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalandbegin"
-      description="AND operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalandbegin"
-      hint="3040">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.andbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_vCnM8aJpEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalandEnd"
-      description="AND operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalandEnd"
-      hint="3041">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.andend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_dn8fUaKJEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalitbegin"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalitbegin"
-      hint="3041">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.itbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_dn8fUKKJEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicalitend"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicalitend"
-      hint="3040">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.itend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_mWMhgKKMEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicallpbegin"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicallpbegin"
-      hint="3041">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.lpbegin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_mWMhgaKMEeWBS5oHY8K2yw"
-      name="org.eclipse.papyrus.effbd.graphicallpend"
-      description="IT operator"
-      identifier="org.eclipse.papyrus.effbd.graphicallpend"
-      hint="3040">
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.effbd.lpend</specializedTypesID>
-  </elementTypeConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="EFFB extension element type set" identifier="org.eclipse.papyrus.effb.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="EFFB" xmi:id="_k4SmgLwFEeSwNLK2W02HwA" xmi:version="2.0">

+  <elementTypeConfigurations description="Create a function on the diagram" hint="3007" identifier="org.eclipse.papyrus.effbd.graphicalfunction" name="org.eclipse.papyrus.effbd.graphicalfunction" xmi:id="_kGRHgJ0AEeW4i7v9QEMhZg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.function</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="inputdata_node" identifier="org.eclipse.papyrus.effbd.inputdata_node" name="Input Data node" xmi:id="_79MooJ56EeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.effbd.inputdata</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="outputdata_node" identifier="org.eclipse.papyrus.effbd.outputdata_node" name="Output Data node" xmi:id="_WtGt4J6IEeWHhcFWyAfOIA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.effbd.outputdata</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="opaqueAction_body" identifier="org.eclipse.papyrus.effbd.opaqueAction_body" name="a body for the opaqueAction" xmi:id="_K6I1AKAbEeWbYYB8YU_3Xg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="OR operator" hint="3038" identifier="org.eclipse.papyrus.effbd.graphicalorbegin" name="org.eclipse.papyrus.effbd.graphicalorbegin" xmi:id="__fIUoKJnEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.orbegin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="OR operator" hint="3039" identifier="org.eclipse.papyrus.effbd.graphicalorEnd" name="org.eclipse.papyrus.effbd.graphicalorEnd" xmi:id="_R6uGMKJoEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.orend</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="AND operator" hint="3040" identifier="org.eclipse.papyrus.effbd.graphicalandbegin" name="org.eclipse.papyrus.effbd.graphicalandbegin" xmi:id="_vCnM8KJpEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.andbegin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="AND operator" hint="3041" identifier="org.eclipse.papyrus.effbd.graphicalandEnd" name="org.eclipse.papyrus.effbd.graphicalandEnd" xmi:id="_vCnM8aJpEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.andend</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="IT operator" hint="3041" identifier="org.eclipse.papyrus.effbd.graphicalitbegin" name="org.eclipse.papyrus.effbd.graphicalitbegin" xmi:id="_dn8fUaKJEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.itbegin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="IT operator" hint="3040" identifier="org.eclipse.papyrus.effbd.graphicalitend" name="org.eclipse.papyrus.effbd.graphicalitend" xmi:id="_dn8fUKKJEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.itend</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="IT operator" hint="3041" identifier="org.eclipse.papyrus.effbd.graphicallpbegin" name="org.eclipse.papyrus.effbd.graphicallpbegin" xmi:id="_mWMhgKKMEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.lpbegin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="IT operator" hint="3040" identifier="org.eclipse.papyrus.effbd.graphicallpend" name="org.eclipse.papyrus.effbd.graphicallpend" xmi:id="_mWMhgaKMEeWBS5oHY8K2yw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.effbd.lpend</specializedTypesID>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
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 3479dcd4c41..2bea82d145a 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,586 +1,586 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/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">
-    <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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3068" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3038" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3039" 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>
-  </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>
-    <matcherConfiguration xmi:id="_s7URTQkGEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration: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">
-    <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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3083" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3042" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3024" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3064" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3084" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3087" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3090" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3094" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3098" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3109" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3111" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3191" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3125" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3126" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3127" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3128" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3129" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3130" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3131" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3202" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3023" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3055" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3089" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3092" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3096" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3101" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3103" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3105" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3188" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3133" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3134" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3136" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3137" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3138" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3139" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3140" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3141" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3142" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3143" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3144" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3199" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3112" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </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>
-    <matcherConfiguration xmi:id="_s7UR_gkGEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration: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">
-    <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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.collaboration.definitions_PapyrusUMLActivityDiagram" target="_s7URSwkGEeWVleXnap4Kwg" xmi:id="_s7USFwkGEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_s7USGAkGEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.collaboration.callActivity" target="_s7UR_AkGEeWVleXnap4Kwg" xmi:id="_s7USGQkGEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_s7USGgkGEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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">

+    <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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3068" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3038" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3039" 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>

+  </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>

+    <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">

+    <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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2001" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3083" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3067" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3080" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3067" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3020" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3024" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3064" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3077" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3084" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3087" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3090" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3094" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3098" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3109" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3111" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3191" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3125" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3126" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3127" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3128" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3129" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3130" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3131" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3202" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3001" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3059" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3023" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3055" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3089" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3092" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3096" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3101" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3103" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3105" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3188" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3133" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3134" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3136" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3137" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3138" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3139" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3140" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3141" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3142" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3143" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3144" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3199" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3001" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3059" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3080" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3002" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3112" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </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>

+    <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">

+    <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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3071" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3070" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </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">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.collaboration.callActivity" target="_s7UR_AkGEeWVleXnap4Kwg" xmi:id="_s7USGQkGEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_s7USGgkGEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
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 64fa7606771..58fa064094b 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
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.collaboration.elementTypeSetCustom" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="lane_partition" identifier="org.eclipse.papyrus.bpmn.collaboration.Lane_Partition" name="Lane ActivityPartition" xmi:id="_ODZj0BBDEeWXVJ4WhgYiRw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <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">
-    <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>
-  </elementTypeConfigurations>
+<?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:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.collaboration.elementTypeSetCustom" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">

+  <elementTypeConfigurations hint="lane_partition" identifier="org.eclipse.papyrus.bpmn.collaboration.Lane_Partition" name="Lane ActivityPartition" xmi:id="_ODZj0BBDEeWXVJ4WhgYiRw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <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">

+    <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>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
index 645f14d9258..28c39e7742b 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
@@ -2,14 +2,14 @@
 <?eclipse version="3.4"?>
 <plugin>
  	<extension
-          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
        <elementTypeSet
        		clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
              path="model/collaboration.elementtypesconfigurations">
        </elementTypeSet>
     </extension> 
     <extension
-          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
        <elementTypeSet
              clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
              path="model/collaborationCustom.elementtypesconfigurations">
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 913332c1929..08fc41f1421 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,586 +1,586 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/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">
-    <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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3068" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3038" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3039" 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>
-  </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>
-    <matcherConfiguration xmi:id="_s7URTQkGEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration: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">
-    <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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3083" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3042" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3024" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3064" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3084" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3087" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3090" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3094" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3098" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3109" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3111" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3191" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3125" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3126" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3127" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3128" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3129" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3130" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3131" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3202" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3023" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3055" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3089" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3092" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3096" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3101" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3103" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3105" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3188" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3133" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3134" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3136" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3137" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3138" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3139" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3140" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3141" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3142" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3143" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3144" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3199" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3003" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3112" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </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>
-    <matcherConfiguration xmi:id="_s7UR_gkGEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration: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">
-    <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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" 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>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" 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>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.process.definitions_PapyrusUMLActivityDiagram" target="_s7URSwkGEeWVleXnap4Kwg" xmi:id="_s7USFwkGEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_s7USGAkGEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.process.callActivity" target="_s7UR_AkGEeWVleXnap4Kwg" xmi:id="_s7USGQkGEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_s7USGgkGEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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">

+    <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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3068" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3038" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3039" 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>

+  </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>

+    <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">

+    <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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2001" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3083" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3067" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3080" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3067" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3020" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3024" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3064" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3077" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3084" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3087" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3090" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3094" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3098" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3109" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3111" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3191" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3125" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3126" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3127" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3128" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3129" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3130" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3131" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3202" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3001" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3059" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3023" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3055" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3089" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3092" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3096" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3101" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3103" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3105" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3188" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3133" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3134" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3136" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3137" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3138" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3139" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3140" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3141" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3142" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3143" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3144" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3199" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3001" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3059" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3080" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3002" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3112" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </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>

+    <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">

+    <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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3071" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3063" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3070" 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>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" 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>

+  </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">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.process.callActivity" target="_s7UR_AkGEeWVleXnap4Kwg" xmi:id="_s7USGQkGEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_s7USGgkGEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </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 0f4550ce1fa..349e6050eed 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
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.process.elementTypeSetCustom" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="lane_partition" identifier="org.eclipse.papyrus.bpmn.process.Lane_Partition" name="Lane ActivityPartition" xmi:id="_ODZj0BBDEeWXVJ4WhgYiRw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <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">
-    <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>
-  </elementTypeConfigurations>
+<?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:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.process.elementTypeSetCustom" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">

+  <elementTypeConfigurations hint="lane_partition" identifier="org.eclipse.papyrus.bpmn.process.Lane_Partition" name="Lane ActivityPartition" xmi:id="_ODZj0BBDEeWXVJ4WhgYiRw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <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">

+    <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>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml
index 3aa5e416b03..12d54823fce 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml
@@ -2,14 +2,14 @@
 <?eclipse version="3.4"?>
 <plugin>
  	<extension
-          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
        <elementTypeSet
              clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
              path="model/process.elementtypesconfigurations">
        </elementTypeSet>
     </extension> 
     <extension
-          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
        <elementTypeSet
              clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
              path="model/processCustom.elementtypesconfigurations">
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
index f79de249662..5bf36f8ea54 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.bpmn,
 Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.core.runtime;bundle-version="3.11.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0";visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations
index 0daa6d253f3..0f01cecf910 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.elementtypesconfigurations
@@ -1,4550 +1,4550 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_ulgXkAkFEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode" name="InclusiveGateway JoinNode" xmi:id="_ulgXkQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgXkgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXkwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode" name="InclusiveGateway ForkNode" xmi:id="_ulgXlAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXlQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXlgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ControlNode" name="InclusiveGateway ControlNode" xmi:id="_ulgXlwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXmAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXmQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityGroup" name="InclusiveGateway ActivityGroup" xmi:id="_ulgXmgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXmwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXnAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityNode" name="InclusiveGateway ActivityNode" xmi:id="_ulgXnQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXngkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXnwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_Element" name="InclusiveGateway Element" xmi:id="_ulgXoAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXoQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXogkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ControlNode" name="Gateway ControlNode" xmi:id="_ulgXowkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXpAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXpQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityGroup" name="Gateway ActivityGroup" xmi:id="_ulgXpgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXpwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXqAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityNode" name="Gateway ActivityNode" xmi:id="_ulgXqQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXqgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXqwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Gateway_Element" name="Gateway Element" xmi:id="_ulgXrAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXrQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXrgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode" name="EventBasedGateway ForkNode" xmi:id="_ulgXrwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXsAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXsQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode" name="EventBasedGateway StructuredActivityNode" xmi:id="_ulgXsgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulgXswkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXtAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InterruptibleActivityRegion" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_ulgXtQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_ulgXtgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InterruptibleActivityRegion</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXtwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ControlNode" name="EventBasedGateway ControlNode" xmi:id="_ulgXuAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXuQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXugkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityGroup" name="EventBasedGateway ActivityGroup" xmi:id="_ulgXuwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXvAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXvQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityNode" name="EventBasedGateway ActivityNode" xmi:id="_ulgXvgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXvwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXwAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_Element" name="EventBasedGateway Element" xmi:id="_ulgXwQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXwgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXwwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode" name="NonExclusiveGateway JoinNode" xmi:id="_ulgXxAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgXxQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXxgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode" name="NonExclusiveGateway ForkNode" xmi:id="_ulgXxwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXyAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXyQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ControlNode" name="NonExclusiveGateway ControlNode" xmi:id="_ulgXygkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXywkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXzAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityGroup" name="NonExclusiveGateway ActivityGroup" xmi:id="_ulgXzQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXzgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgXzwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityNode" name="NonExclusiveGateway ActivityNode" xmi:id="_ulgX0AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX0QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX0gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_Element" name="NonExclusiveGateway Element" xmi:id="_ulgX0wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX1AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX1QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode" name="ParallelGateway JoinNode" xmi:id="_ulgX1gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgX1wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX2AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode" name="ParallelGateway ForkNode" xmi:id="_ulgX2QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgX2gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX2wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ControlNode" name="ParallelGateway ControlNode" xmi:id="_ulgX3AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgX3QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX3gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityGroup" name="ParallelGateway ActivityGroup" xmi:id="_ulgX3wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgX4AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX4QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityNode" name="ParallelGateway ActivityNode" xmi:id="_ulgX4gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX4wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX5AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_Element" name="ParallelGateway Element" xmi:id="_ulgX5QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX5gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX5wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode" name="ComplexGateway JoinNode" xmi:id="_ulgX6AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgX6QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX6gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode" name="ComplexGateway ForkNode" xmi:id="_ulgX6wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgX7AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX7QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ControlNode" name="ComplexGateway ControlNode" xmi:id="_ulgX7gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgX7wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX8AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityGroup" name="ComplexGateway ActivityGroup" xmi:id="_ulgX8QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgX8gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX8wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityNode" name="ComplexGateway ActivityNode" xmi:id="_ulgX9AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX9QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX9gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_Element" name="ComplexGateway Element" xmi:id="_ulgX9wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX-AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX-QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DecisionNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode" name="ExclusiveGateway DecisionNode" xmi:id="_ulgX-gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_ulgX-wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX_AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::MergeNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode" name="ExclusiveGateway MergeNode" xmi:id="_ulgX_QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_ulgX_gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgX_wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ControlNode" name="ExclusiveGateway ControlNode" xmi:id="_ulgYAAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgYAQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYAgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityGroup" name="ExclusiveGateway ActivityGroup" xmi:id="_ulgYAwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgYBAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYBQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityNode" name="ExclusiveGateway ActivityNode" xmi:id="_ulgYBgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgYBwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYCAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_Element" name="ExclusiveGateway Element" xmi:id="_ulgYCQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYCgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYCwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.RootElement_PackageableElement" name="RootElement PackageableElement" xmi:id="_ulgYDAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYDQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYDgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::RootElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.RootElement_Element" name="RootElement Element" xmi:id="_ulgYDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYEAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYEQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::RootElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageImport" identifier="org.eclipse.papyrus.bpmn.Import_UML::PackageImport" name="Import" xmi:id="_ulgYEgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_ulgYEwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYFAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Import</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Package" identifier="org.eclipse.papyrus.bpmn.Definitions_Package" name="Definitions Package" xmi:id="_ulgYFQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_ulgYFgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYFwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Definitions_Element" name="Definitions Element" xmi:id="_ulgYGAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYGQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYGgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition" name="LaneSet ActivityPartition" xmi:id="_ulgYGwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulgYHAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYHQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LaneSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LaneSet_Element" name="LaneSet Element" xmi:id="_ulgYHgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYHwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYIAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LaneSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Monitoring_Class" name="Monitoring Class" xmi:id="_ulgYIQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulgYIgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYIwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Monitoring</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Monitoring_Element" name="Monitoring Element" xmi:id="_ulgYJAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYJQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYJgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Monitoring</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Activity" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Activity" name="BPMNProcess Activity" xmi:id="_ulgYJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_ulgYKAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYKQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Behavior" name="BPMNProcess Behavior" xmi:id="_ulgYKgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYKwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYLAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_PackageableElement" name="BPMNProcess PackageableElement" xmi:id="_ulgYLQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYLgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYLwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Element" name="BPMNProcess Element" xmi:id="_ulgYMAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYMQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYMgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Lane_ActivityPartition" name="Lane ActivityPartition" xmi:id="_ulgYMwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulgYNAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYNQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Lane</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Lane_Element" name="Lane Element" xmi:id="_ulgYNgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYNwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYOAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Lane</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_OpaqueBehavior" name="GlobalScriptTask OpaqueBehavior" xmi:id="_ulgYOQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYOgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYOwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Behavior" name="GlobalScriptTask Behavior" xmi:id="_ulgYPAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYPQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYPgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_PackageableElement" name="GlobalScriptTask PackageableElement" xmi:id="_ulgYPwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYQAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYQQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Element" name="GlobalScriptTask Element" xmi:id="_ulgYQgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYQwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYRAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Auditing_Class" name="Auditing Class" xmi:id="_ulgYRQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulgYRgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYRwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Auditing</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Auditing_Element" name="Auditing Element" xmi:id="_ulgYSAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYSQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYSgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Auditing</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_OpaqueBehavior" name="GlobalTask OpaqueBehavior" xmi:id="_ulgYSwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYTAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYTQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Behavior" name="GlobalTask Behavior" xmi:id="_ulgYTgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYTwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYUAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalTask_PackageableElement" name="GlobalTask PackageableElement" xmi:id="_ulgYUQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYUgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYUwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Element" name="GlobalTask Element" xmi:id="_ulgYVAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYVQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYVgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_OpaqueBehavior" name="GlobalBusinessRuleTask OpaqueBehavior" xmi:id="_ulgYVwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYWAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYWQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Behavior" name="GlobalBusinessRuleTask Behavior" xmi:id="_ulgYWgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYWwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYXAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_PackageableElement" name="GlobalBusinessRuleTask PackageableElement" xmi:id="_ulgYXQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYXgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYXwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Element" name="GlobalBusinessRuleTask Element" xmi:id="_ulgYYAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYYQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYYgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_CallEvent" name="CompensateEventDefinition CallEvent" xmi:id="_ulgYYwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYZAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYZQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Event" name="CompensateEventDefinition Event" xmi:id="_ulgYZgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYZwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYaAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_PackageableElement" name="CompensateEventDefinition PackageableElement" xmi:id="_ulgYaQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYagkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYawkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Element" name="CompensateEventDefinition Element" xmi:id="_ulgYbAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYbQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYbgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_CallEvent" name="EscalationEventDefinition CallEvent" xmi:id="_ulgYbwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYcAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYcQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Event" name="EscalationEventDefinition Event" xmi:id="_ulgYcgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYcwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYdAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_PackageableElement" name="EscalationEventDefinition PackageableElement" xmi:id="_ulgYdQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYdgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYdwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Element" name="EscalationEventDefinition Element" xmi:id="_ulgYeAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYeQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYegkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_ChangeEvent" name="TimerEventDefinition ChangeEvent" xmi:id="_ulgYewkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ulgYfAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYfQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Event" name="TimerEventDefinition Event" xmi:id="_ulgYfgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYfwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYgAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_PackageableElement" name="TimerEventDefinition PackageableElement" xmi:id="_ulgYgQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYggkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYgwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Element" name="TimerEventDefinition Element" xmi:id="_ulgYhAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYhQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYhgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_CallEvent" name="SignalEventDefinition CallEvent" xmi:id="_ulgYhwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYiAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYiQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Event" name="SignalEventDefinition Event" xmi:id="_ulgYigkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYiwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYjAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_PackageableElement" name="SignalEventDefinition PackageableElement" xmi:id="_ulgYjQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYjgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYjwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Element" name="SignalEventDefinition Element" xmi:id="_ulgYkAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYkQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYkgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FinalNode" name="EndEvent FinalNode" xmi:id="_ulgYkwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalNode.gif" xmi:id="_ulgYlAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FinalNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulgYlQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction" name="EndEvent CallOperationAction" xmi:id="_ulgYlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg-oAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-oQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode" name="EndEvent FlowFinalNode" xmi:id="_ulg-ogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg-owkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-pAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_ActivityNode" name="EndEvent ActivityNode" xmi:id="_ulg-pQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-pgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-pwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EndEvent_Element" name="EndEvent Element" xmi:id="_ulg-qAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-qQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-qgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Event" name="EventDefinition Event" xmi:id="_ulg-qwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-rAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-rQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.EventDefinition_PackageableElement" name="EventDefinition PackageableElement" xmi:id="_ulg-rgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-rwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-sAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Element" name="EventDefinition Element" xmi:id="_ulg-sQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-sgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-swkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_ActivityNode" name="BPMNEvent ActivityNode" xmi:id="_ulg-tAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-tQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-tgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_Element" name="BPMNEvent Element" xmi:id="_ulg-twkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-uAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-uQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Error_Class" name="Error Class" xmi:id="_ulg-ugkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg-uwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-vAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Error_PackageableElement" name="Error PackageableElement" xmi:id="_ulg-vQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-vgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-vwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Error_Element" name="Error Element" xmi:id="_ulg-wAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-wQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-wgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction" name="CatchEvent AcceptEventAction" xmi:id="_ulg-wwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg-xAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-xQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_InitialNode" name="CatchEvent InitialNode" xmi:id="_ulg-xgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg-xwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-yAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_ActivityNode" name="CatchEvent ActivityNode" xmi:id="_ulg-yQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-ygkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-ywkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CatchEvent_Element" name="CatchEvent Element" xmi:id="_ulg-zAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-zQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-zgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_CallEvent" name="MessageEventDefinition CallEvent" xmi:id="_ulg-zwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg-0AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-0QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Event" name="MessageEventDefinition Event" xmi:id="_ulg-0gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-0wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-1AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_PackageableElement" name="MessageEventDefinition PackageableElement" xmi:id="_ulg-1QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-1gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-1wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Element" name="MessageEventDefinition Element" xmi:id="_ulg-2AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-2QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-2gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction" name="StartEvent AcceptEventAction" xmi:id="_ulg-2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg-3AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-3QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_InitialNode" name="StartEvent InitialNode" xmi:id="_ulg-3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg-3wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-4AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_ActivityNode" name="StartEvent ActivityNode" xmi:id="_ulg-4QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-4gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-4wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.StartEvent_Element" name="StartEvent Element" xmi:id="_ulg-5AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-5QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-5gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Class" name="BPMNSignal Class" xmi:id="_ulg-5wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg-6AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-6QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_PackageableElement" name="BPMNSignal PackageableElement" xmi:id="_ulg-6gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-6wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-7AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Element" name="BPMNSignal Element" xmi:id="_ulg-7QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-7gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-7wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_ChangeEvent" name="ConditionalEventDefinition ChangeEvent" xmi:id="_ulg-8AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ulg-8QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-8gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Event" name="ConditionalEventDefinition Event" xmi:id="_ulg-8wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-9AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-9QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_PackageableElement" name="ConditionalEventDefinition PackageableElement" xmi:id="_ulg-9gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-9wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg--AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Element" name="ConditionalEventDefinition Element" xmi:id="_ulg--QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg--gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg--wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_CallEvent" name="LinkEventDefinition CallEvent" xmi:id="_ulg-_AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg-_QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg-_gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Event" name="LinkEventDefinition Event" xmi:id="_ulg-_wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_AAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_AQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_PackageableElement" name="LinkEventDefinition PackageableElement" xmi:id="_ulg_AgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_AwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_BAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Element" name="LinkEventDefinition Element" xmi:id="_ulg_BQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_BgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_BwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_CallEvent" name="ErrorEventDefinition CallEvent" xmi:id="_ulg_CAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_CQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_CgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Event" name="ErrorEventDefinition Event" xmi:id="_ulg_CwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_DAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_DQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_PackageableElement" name="ErrorEventDefinition PackageableElement" xmi:id="_ulg_DgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_DwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_EAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Element" name="ErrorEventDefinition Element" xmi:id="_ulg_EQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_EgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_EwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_ulg_FAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg_FQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_FgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode" name="IntermediateCatchEvent InitialNode" xmi:id="_ulg_FwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg_GAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_GQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_ActivityNode" name="IntermediateCatchEvent ActivityNode" xmi:id="_ulg_GgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_GwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_HAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_Element" name="IntermediateCatchEvent Element" xmi:id="_ulg_HQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_HgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_HwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::SendObjectAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction" name="IntermediateThrowEvent SendObjectAction" xmi:id="_ulg_IAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_ulg_IQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.SendObjectAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_IgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction" name="IntermediateThrowEvent CallOperationAction" xmi:id="_ulg_IwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_JAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_JQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_ulg_JgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_JwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_KAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_ActivityNode" name="IntermediateThrowEvent ActivityNode" xmi:id="_ulg_KQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_KgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_KwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_Element" name="IntermediateThrowEvent Element" xmi:id="_ulg_LAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_LQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_LgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_CallEvent" name="TerminateEventDefinition CallEvent" xmi:id="_ulg_LwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_MAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_MQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Event" name="TerminateEventDefinition Event" xmi:id="_ulg_MgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_MwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_NAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_PackageableElement" name="TerminateEventDefinition PackageableElement" xmi:id="_ulg_NQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_NgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_NwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Element" name="TerminateEventDefinition Element" xmi:id="_ulg_OAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_OQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_OgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction" name="ThrowEvent CallOperationAction" xmi:id="_ulg_OwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_PAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_PQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode" name="ThrowEvent FlowFinalNode" xmi:id="_ulg_PgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_PwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_QAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_ActivityNode" name="ThrowEvent ActivityNode" xmi:id="_ulg_QQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_QgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_QwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_Element" name="ThrowEvent Element" xmi:id="_ulg_RAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_RQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_RgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction" name="BoundaryEvent AcceptEventAction" xmi:id="_ulg_RwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg_SAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_SQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode" name="BoundaryEvent InitialNode" xmi:id="_ulg_SgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg_SwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_TAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_ActivityNode" name="BoundaryEvent ActivityNode" xmi:id="_ulg_TQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_TgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_TwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_Element" name="BoundaryEvent Element" xmi:id="_ulg_UAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_UQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_UgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction" name="ImplicitThrowEvent CallOperationAction" xmi:id="_ulg_UwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_VAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_VQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_ulg_VgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_VwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_WAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_ActivityNode" name="ImplicitThrowEvent ActivityNode" xmi:id="_ulg_WQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_WgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_WwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_Element" name="ImplicitThrowEvent Element" xmi:id="_ulg_XAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_XQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_XgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_CallEvent" name="CancelEventDefinition CallEvent" xmi:id="_ulg_XwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_YAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_YQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Event" name="CancelEventDefinition Event" xmi:id="_ulg_YgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_YwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_ZAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_PackageableElement" name="CancelEventDefinition PackageableElement" xmi:id="_ulg_ZQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_ZgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_ZwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Element" name="CancelEventDefinition Element" xmi:id="_ulg_aAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_aQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_agkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Escalation_Class" name="Escalation Class" xmi:id="_ulg_awkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_bAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_bQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Escalation_PackageableElement" name="Escalation PackageableElement" xmi:id="_ulg_bgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_bwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_cAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Escalation_Element" name="Escalation Element" xmi:id="_ulg_cQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_cgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_cwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Comment" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Comment" name="TextAnnotation Comment" xmi:id="_ulg_dAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_ulg_dQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_dgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TextAnnotation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Element" name="TextAnnotation Element" xmi:id="_ulg_dwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_eAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_eQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::TextAnnotation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Enumeration" identifier="org.eclipse.papyrus.bpmn.Category_Enumeration" name="Category Enumeration" xmi:id="_ulg_egkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_ulg_ewkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_fAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Category_PackageableElement" name="Category PackageableElement" xmi:id="_ulg_fQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_fgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_fwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Category_Element" name="Category Element" xmi:id="_ulg_gAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_gQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_ggkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Dependency" name="BPMNAssociation Dependency" xmi:id="_ulg_gwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulg_hAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_hQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Element" name="BPMNAssociation Element" xmi:id="_ulg_hgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_hwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_iAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Group_ActivityPartition" name="Group ActivityPartition" xmi:id="_ulg_iQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulg_igkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_iwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Group</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Group_Element" name="Group Element" xmi:id="_ulg_jAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_jQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_jgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Group</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::EnumerationLiteral" identifier="org.eclipse.papyrus.bpmn.CategoryValue_EnumerationLiteral" name="CategoryValue EnumerationLiteral" xmi:id="_ulg_jwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_ulg_kAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_kQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CategoryValue</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CategoryValue_Element" name="CategoryValue Element" xmi:id="_ulg_kgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_kwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_lAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CategoryValue</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNArtifact" name="BPMNArtifact" xmi:id="_ulg_lQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_lgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_lwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNArtifact</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.FlowNode_ActivityNode" name="FlowNode ActivityNode" xmi:id="_ulg_mAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_mQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_mgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::FlowNode</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowNode_Element" name="FlowNode Element" xmi:id="_ulg_mwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_nAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_nQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::FlowNode</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.FormalExpression_OpaqueExpression" name="FormalExpression OpaqueExpression" xmi:id="_ulg_ngkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulg_nwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_oAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::FormalExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FormalExpression_Element" name="FormalExpression Element" xmi:id="_ulg_oQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_ogkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_owkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::FormalExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Resource_Class" name="Resource Class" xmi:id="_ulg_pAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_pQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_pgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Resource_PackageableElement" name="Resource PackageableElement" xmi:id="_ulg_pwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_qAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_qQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Resource_Element" name="Resource Element" xmi:id="_ulg_qgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_qwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_rAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowElement" name="FlowElement" xmi:id="_ulg_rQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_rgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_rwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::FlowElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Property" name="CorrelationPropertyBinding Property" xmi:id="_ulg_sAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_sQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_sgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyBinding</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Element" name="CorrelationPropertyBinding Element" xmi:id="_ulg_swkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_tAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_tQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyBinding</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Class" name="CorrelationSubscription Class" xmi:id="_ulg_tgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_twkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_uAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationSubscription</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Element" name="CorrelationSubscription Element" xmi:id="_ulg_uQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_ugkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_uwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationSubscription</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.CallableElement_Behavior" name="CallableElement Behavior" xmi:id="_ulg_vAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulg_vQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_vgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CallableElement_PackageableElement" name="CallableElement PackageableElement" xmi:id="_ulg_vwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_wAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_wQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallableElement_Element" name="CallableElement Element" xmi:id="_ulg_wgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_wwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_xAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlFlow" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow" name="SequenceFlow ControlFlow" xmi:id="_ulg_xQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_ulg_xgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_xwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SequenceFlow</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_Element" name="SequenceFlow Element" xmi:id="_ulg_yAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_yQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_ygkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SequenceFlow</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Dependency" name="CorrelationPropertyRetrievalExpression Dependency" xmi:id="_ulg_ywkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulg_zAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_zQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyRetrievalExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Element" name="CorrelationPropertyRetrievalExpression Element" xmi:id="_ulg_zgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_zwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_0AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyRetrievalExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_OpaqueExpression" name="BPMNExpression OpaqueExpression" xmi:id="_ulg_0QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulg_0gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_0wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_Element" name="BPMNExpression Element" xmi:id="_ulg_1AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_1QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_1gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.CorrelationProperty_Property" name="CorrelationProperty Property" xmi:id="_ulg_1wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_2AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_2QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationProperty</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationProperty_Element" name="CorrelationProperty Element" xmi:id="_ulg_2gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_2wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_3AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationProperty</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.ItemDefinition_Class" name="ItemDefinition Class" xmi:id="_ulg_3QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_3gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_3wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ItemDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ItemDefinition_PackageableElement" name="ItemDefinition PackageableElement" xmi:id="_ulg_4AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_4QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_4gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ItemDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ItemDefinition_Element" name="ItemDefinition Element" xmi:id="_ulg_4wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_5AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_5QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ItemDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.CorrelationKey_Class" name="CorrelationKey Class" xmi:id="_ulg_5gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_5wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_6AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationKey</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationKey_Element" name="CorrelationKey Element" xmi:id="_ulg_6QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_6gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_6wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CorrelationKey</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowElementsContainer" name="FlowElementsContainer" xmi:id="_ulg_7AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_7QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_7gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::FlowElementsContainer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.BPMNMessage_Class" name="BPMNMessage Class" xmi:id="_ulg_7wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_8AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_8QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNMessage</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNMessage_PackageableElement" name="BPMNMessage PackageableElement" xmi:id="_ulg_8gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_8wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_9AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNMessage</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNMessage_Element" name="BPMNMessage Element" xmi:id="_ulg_9QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_9gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_9wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNMessage</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.ResourceParameter_Property" name="ResourceParameter Property" xmi:id="_ulg_-AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_-QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg_-gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceParameter</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceParameter_Element" name="ResourceParameter Element" xmi:id="_ulg_-wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg__AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulg__QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceParameter</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ParameterSet" identifier="org.eclipse.papyrus.bpmn.OutputSet_ParameterSet" name="OutputSet ParameterSet" xmi:id="_ulg__gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterSet.gif" xmi:id="_ulg__wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ParameterSet</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAAAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::OutputSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.OutputSet_Element" name="OutputSet Element" xmi:id="_ulhAAQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAAgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAAwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::OutputSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ParameterSet" identifier="org.eclipse.papyrus.bpmn.InputSet_ParameterSet" name="InputSet ParameterSet" xmi:id="_ulhABAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterSet.gif" xmi:id="_ulhABQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ParameterSet</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhABgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InputSet_Element" name="InputSet Element" xmi:id="_ulhABwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhACAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhACQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::State" identifier="org.eclipse.papyrus.bpmn.DataState_State" name="DataState State" xmi:id="_ulhACgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif" xmi:id="_ulhACwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.State</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhADAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataState</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataState_Element" name="DataState Element" xmi:id="_ulhADQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhADgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhADwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataState</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.DataObjectReference_DataStoreNode" name="DataObjectReference DataStoreNode" xmi:id="_ulhAEAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAEQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAEgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataObjectReference</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataObjectReference_TypedElement" name="DataObjectReference TypedElement" xmi:id="_ulhAEwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAFAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAFQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataObjectReference</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataObjectReference_Element" name="DataObjectReference Element" xmi:id="_ulhAFgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAFwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAGAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataObjectReference</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.bpmn.DataOutputAssociation_ObjectFlow" name="DataOutputAssociation ObjectFlow" xmi:id="_ulhAGQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_ulhAGgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAGwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutputAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataOutputAssociation_Element" name="DataOutputAssociation Element" xmi:id="_ulhAHAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAHQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAHgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutputAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.InputOutputBinding_Dependency" name="InputOutputBinding Dependency" xmi:id="_ulhAHwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhAIAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAIQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputOutputBinding</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InputOutputBinding_Element" name="InputOutputBinding Element" xmi:id="_ulhAIgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAIwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAJAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputOutputBinding</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.Assignment_Dependency" name="Assignment Dependency" xmi:id="_ulhAJQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhAJgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAJwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Assignment</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Assignment_Element" name="Assignment Element" xmi:id="_ulhAKAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAKQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAKgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Assignment</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OutputPin" identifier="org.eclipse.papyrus.bpmn.DataOutput_OutputPin" name="DataOutput OutputPin" xmi:id="_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_ulhALAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhALQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Parameter" identifier="org.eclipse.papyrus.bpmn.DataOutput_Parameter" name="DataOutput Parameter" xmi:id="_ulhALgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_ulhALwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAMAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityParameterNode" identifier="org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode" name="DataOutput ActivityParameterNode" xmi:id="_ulhAMQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_ulhAMgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAMwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataOutput_TypedElement" name="DataOutput TypedElement" xmi:id="_ulhANAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhANQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhANgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataOutput_Element" name="DataOutput Element" xmi:id="_ulhANwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAOAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAOQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.BPMNProperty_DataStoreNode" name="BPMNProperty DataStoreNode" xmi:id="_ulhAOgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAOwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAPAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProperty</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.BPMNProperty_TypedElement" name="BPMNProperty TypedElement" xmi:id="_ulhAPQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAPgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAPwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProperty</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNProperty_Element" name="BPMNProperty Element" xmi:id="_ulhAQAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAQQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAQgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNProperty</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.ItemAwareElement_TypedElement" name="ItemAwareElement TypedElement" xmi:id="_ulhAQwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhARAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhARQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ItemAwareElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ItemAwareElement_Element" name="ItemAwareElement Element" xmi:id="_ulhARgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhARwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhASAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ItemAwareElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.InputOutputSpecification_Behavior" name="InputOutputSpecification Behavior" xmi:id="_ulhASQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulhASgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhASwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputOutputSpecification</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.InputOutputSpecification_Action" name="InputOutputSpecification Action" xmi:id="_ulhATAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhATQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhATgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputOutputSpecification</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InputOutputSpecification_Element" name="InputOutputSpecification Element" xmi:id="_ulhATwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAUAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAUQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InputOutputSpecification</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.DataStore_Class" name="DataStore Class" xmi:id="_ulhAUgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulhAUwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAVAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataStore</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.DataStore_PackageableElement" name="DataStore PackageableElement" xmi:id="_ulhAVQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhAVgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAVwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataStore</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataStore_Element" name="DataStore Element" xmi:id="_ulhAWAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAWQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAWgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataStore</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.bpmn.DataInputAssociation_ObjectFlow" name="DataInputAssociation ObjectFlow" xmi:id="_ulhAWwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_ulhAXAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAXQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInputAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataInputAssociation_Element" name="DataInputAssociation Element" xmi:id="_ulhAXgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAXwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAYAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInputAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode" name="DataStoreReference DataStoreNode" xmi:id="_ulhAYQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAYgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAYwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataStoreReference</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataStoreReference_Element" name="DataStoreReference Element" xmi:id="_ulhAZAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAZQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAZgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataStoreReference</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataStoreReference_TypedElement" name="DataStoreReference TypedElement" xmi:id="_ulhAZwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAaAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAaQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataStoreReference</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.DataObject_DataStoreNode" name="DataObject DataStoreNode" xmi:id="_ulhAagkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAawkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAbAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataObject</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataObject_TypedElement" name="DataObject TypedElement" xmi:id="_ulhAbQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAbgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAbwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataObject</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataObject_Element" name="DataObject Element" xmi:id="_ulhAcAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAcQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAcgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataObject</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin" identifier="org.eclipse.papyrus.bpmn.DataInput_InputPin" name="DataInput InputPin" xmi:id="_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_ulhAdAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAdQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Parameter" identifier="org.eclipse.papyrus.bpmn.DataInput_Parameter" name="DataInput Parameter" xmi:id="_ulhAdgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_ulhAdwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAeAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityParameterNode" identifier="org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode" name="DataInput ActivityParameterNode" xmi:id="_ulhAeQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_ulhAegkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAewkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataInput_TypedElement" name="DataInput TypedElement" xmi:id="_ulhAfAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAfQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAfgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataInput_Element" name="DataInput Element" xmi:id="_ulhAfwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAgAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAgQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow" name="DataAssociation ObjectFlow" xmi:id="_ulhAggkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_ulhAgwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAhAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataAssociation_Element" name="DataAssociation Element" xmi:id="_ulhAhQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAhgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAhwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::DataAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.UserTask_OpaqueAction" name="UserTask OpaqueAction" xmi:id="_ulhAiAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhAiQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAigkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.UserTask_Action" name="UserTask Action" xmi:id="_ulhAiwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhAjAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAjQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.UserTask_ActivityNode" name="UserTask ActivityNode" xmi:id="_ulhAjgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhAjwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAkAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.UserTask_Element" name="UserTask Element" xmi:id="_ulhAkQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAkgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAkwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.HumanPerformer_Property" name="HumanPerformer Property" xmi:id="_ulhAlAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhAlQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAlgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::HumanPerformer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.HumanPerformer_Element" name="HumanPerformer Element" xmi:id="_ulhAlwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAmAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAmQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::HumanPerformer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_OpaqueBehavior" name="GlobalUserTask OpaqueBehavior" xmi:id="_ulhAmgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulhAmwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAnAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_Behavior" name="GlobalUserTask Behavior" xmi:id="_ulhAnQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulhAngkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAnwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_PackageableElement" name="GlobalUserTask PackageableElement" xmi:id="_ulhAoAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhAoQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAogkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_Element" name="GlobalUserTask Element" xmi:id="_ulhAowkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhApAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhApQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Image" identifier="org.eclipse.papyrus.bpmn.Rendering_Image" name="Rendering Image" xmi:id="_ulhApgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Image.gif" xmi:id="_ulhApwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Image</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAqAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Rendering</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Rendering_Element" name="Rendering Element" xmi:id="_ulhAqQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAqgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAqwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Rendering</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_OpaqueBehavior" name="GlobalManualTask OpaqueBehavior" xmi:id="_ulhArAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulhArQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhArgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_Behavior" name="GlobalManualTask Behavior" xmi:id="_ulhArwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulhAsAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAsQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_PackageableElement" name="GlobalManualTask PackageableElement" xmi:id="_ulhAsgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhAswkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAtAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_Element" name="GlobalManualTask Element" xmi:id="_ulhAtQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAtgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAtwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction" name="ManualTask OpaqueAction" xmi:id="_ulhAuAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhAuQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAugkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ManualTask_Action" name="ManualTask Action" xmi:id="_ulhAuwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhAvAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAvQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ManualTask_ActivityNode" name="ManualTask ActivityNode" xmi:id="_ulhAvgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhAvwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAwAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ManualTask_Element" name="ManualTask Element" xmi:id="_ulhAwQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAwgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAwwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.PotentialOwner_Property" name="PotentialOwner Property" xmi:id="_ulhAxAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhAxQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAxgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PotentialOwner</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.PotentialOwner_Element" name="PotentialOwner Element" xmi:id="_ulhAxwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAyAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAyQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PotentialOwner</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InteractionNode" name="InteractionNode" xmi:id="_ulhAygkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAywkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAzAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::InteractionNode</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.Participant_Property" name="Participant Property" xmi:id="_ulhAzQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhAzgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhAzwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Participant</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Participant_Element" name="Participant Element" xmi:id="_ulhA0AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA0QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA0gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Participant</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.PartnerRole_Class" name="PartnerRole Class" xmi:id="_ulhA0wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulhA1AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA1QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PartnerRole</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.PartnerRole_PackageableElement" name="PartnerRole PackageableElement" xmi:id="_ulhA1gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhA1wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA2AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PartnerRole</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.PartnerRole_Element" name="PartnerRole Element" xmi:id="_ulhA2QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA2gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA2wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PartnerRole</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.MessageFlow_InformationFlow_UML::InformationFlow" name="MessageFlow InformationFlow" xmi:id="_ulhA3AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhA3QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA3gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageFlow</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageFlow_Element" name="MessageFlow Element" xmi:id="_ulhA3wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA4AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA4QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageFlow</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Collaboration" identifier="org.eclipse.papyrus.bpmn.BPMNCollaboration_Collaboration" name="BPMNCollaboration Collaboration" xmi:id="_ulhA4gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_ulhA4wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA5AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNCollaboration</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNCollaboration_PackageableElement" name="BPMNCollaboration PackageableElement" xmi:id="_ulhA5QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhA5gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA5wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNCollaboration</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNCollaboration_Element" name="BPMNCollaboration Element" xmi:id="_ulhA6AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA6QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA6gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNCollaboration</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.MessageFlowAssociation_Dependency" name="MessageFlowAssociation Dependency" xmi:id="_ulhA6wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhA7AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA7QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageFlowAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageFlowAssociation_Element" name="MessageFlowAssociation Element" xmi:id="_ulhA7gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA7wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA8AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MessageFlowAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InstanceSpecification" identifier="org.eclipse.papyrus.bpmn.PartnerEntity_InstanceSpecification" name="PartnerEntity InstanceSpecification" xmi:id="_ulhA8QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_ulhA8gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA8wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PartnerEntity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.PartnerEntity_PackageableElement" name="PartnerEntity PackageableElement" xmi:id="_ulhA9AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhA9QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA9gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PartnerEntity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.PartnerEntity_Element" name="PartnerEntity Element" xmi:id="_ulhA9wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA-AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA-QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::PartnerEntity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.ParticipantAssociation_Dependency" name="ParticipantAssociation Dependency" xmi:id="_ulhA-gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhA-wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA_AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParticipantAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParticipantAssociation_Element" name="ParticipantAssociation Element" xmi:id="_ulhA_QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA_gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhA_wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParticipantAssociation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::MultiplicityElement" identifier="org.eclipse.papyrus.bpmn.ParticipantMultiplicity_MultiplicityElement" name="ParticipantMultiplicity MultiplicityElement" xmi:id="_ulhBAAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MultiplicityElement.gif" xmi:id="_ulhBAQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.MultiplicityElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBAgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParticipantMultiplicity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParticipantMultiplicity_Element" name="ParticipantMultiplicity Element" xmi:id="_ulhBAwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBBAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBBQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ParticipantMultiplicity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Comment" identifier="org.eclipse.papyrus.bpmn.Documentation_Comment" name="Documentation Comment" xmi:id="_ulhBBgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_ulhBBwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBCAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Documentation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Documentation_Element" name="Documentation Element" xmi:id="_ulhBCQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBCgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBCwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Documentation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Stereotype" identifier="org.eclipse.papyrus.bpmn.ExtensionDefinition" name="ExtensionDefinition" xmi:id="_ulhBDAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_ulhBDQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBDgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExtensionDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Constraint" identifier="org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint" name="BPMNRelationship Constraint" xmi:id="_ulhBDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_ulhBEAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBEQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNRelationship</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNRelationship_Element" name="BPMNRelationship Element" xmi:id="_ulhBEgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBEwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBFAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNRelationship</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BaseElement" name="BaseElement" xmi:id="_ulhBFQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBFgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBFwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BaseElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Slot" identifier="org.eclipse.papyrus.bpmn.ExtensionAttributeValue" name="ExtensionAttributeValue" xmi:id="_ulhBGAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_ulhBGQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBGgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExtensionAttributeValue</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.ExtensionAttributeDefinition" name="ExtensionAttributeDefinition" xmi:id="_ulhBGwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhBHAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBHQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ExtensionAttributeDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Stereotype" identifier="org.eclipse.papyrus.bpmn.BPMNExtension" name="BPMNExtension" xmi:id="_ulhBHgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_ulhBHwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBIAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNExtension</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Operation" identifier="org.eclipse.papyrus.bpmn.BPMNOperation_Operation" name="BPMNOperation Operation" xmi:id="_ulhBIQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_ulhBIgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBIwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNOperation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNOperation_Element" name="BPMNOperation Element" xmi:id="_ulhBJAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBJQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBJgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNOperation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Interface" identifier="org.eclipse.papyrus.bpmn.BPMNInterface_Interface" name="BPMNInterface Interface" xmi:id="_ulhBJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_ulhBKAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBKQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNInterface</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNInterface_PackageableElement" name="BPMNInterface PackageableElement" xmi:id="_ulhBKgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhBKwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBLAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNInterface</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNInterface_Element" name="BPMNInterface Element" xmi:id="_ulhBLQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBLgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBLwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNInterface</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.SubConversation_InformationFlow_UML::InformationFlow" name="SubConversation InformationFlow" xmi:id="_ulhBMAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBMQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBMgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SubConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SubConversation_Element" name="SubConversation Element" xmi:id="_ulhBMwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBNAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBNQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SubConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.ConversationNode_InformationFlow_UML::InformationFlow" name="ConversationNode InformationFlow" xmi:id="_ulhBNgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBNwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBOAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConversationNode</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConversationNode_Element" name="ConversationNode Element" xmi:id="_ulhBOQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBOgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBOwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConversationNode</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Collaboration" identifier="org.eclipse.papyrus.bpmn.GlobalConversation_Collaboration" name="GlobalConversation Collaboration" xmi:id="_ulhBPAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_ulhBPQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBPgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalConversation_PackageableElement" name="GlobalConversation PackageableElement" xmi:id="_ulhBPwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhBQAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBQQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalConversation_Element" name="GlobalConversation Element" xmi:id="_ulhBQgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBQwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBRAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::GlobalConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.CallConversation_InformationFlow_UML::InformationFlow" name="CallConversation InformationFlow" xmi:id="_ulhBRQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBRgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBRwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallConversation_Element" name="CallConversation Element" xmi:id="_ulhBSAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBSQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBSgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallConversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.Conversation_InformationFlow_UML::InformationFlow" name="Conversation InformationFlow" xmi:id="_ulhBSwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBTAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBTQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Conversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Conversation_Element" name="Conversation Element" xmi:id="_ulhBTgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBTwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBUAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Conversation</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.ConversationLink_Dependency" name="ConversationLink Dependency" xmi:id="_ulhBUQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhBUgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBUwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConversationLink</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConversationLink_Element" name="ConversationLink Element" xmi:id="_ulhBVAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBVQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBVgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ConversationLink</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode" name="SubProcess StructuredActivityNode" xmi:id="_ulhBVwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhBWAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBWQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.SubProcess_Action" name="SubProcess Action" xmi:id="_ulhBWgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBWwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBXAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.SubProcess_ActivityNode" name="SubProcess ActivityNode" xmi:id="_ulhBXQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBXgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBXwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SubProcess_Element" name="SubProcess Element" xmi:id="_ulhBYAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBYQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBYgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.Performer_Property" name="Performer Property" xmi:id="_ulhBYwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhBZAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBZQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Performer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Performer_Element" name="Performer Element" xmi:id="_ulhBZgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBZwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBaAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Performer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.BPMNActivity_Action" name="BPMNActivity Action" xmi:id="_ulhBaQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBagkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBawkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BPMNActivity_ActivityNode" name="BPMNActivity ActivityNode" xmi:id="_ulhBbAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBbQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBbgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNActivity_Element" name="BPMNActivity Element" xmi:id="_ulhBbwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBcAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBcQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BPMNActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.LoopCharacteristics_StructuredActivityNode" name="LoopCharacteristics StructuredActivityNode" xmi:id="_ulhBcgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhBcwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBdAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LoopCharacteristics_Element" name="LoopCharacteristics Element" xmi:id="_ulhBdQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBdgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBdwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::LoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallBehaviorAction" identifier="org.eclipse.papyrus.bpmn.CallActivity_CallBehaviorAction" name="CallActivity CallBehaviorAction" xmi:id="_ulhBeAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_ulhBeQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallBehaviorAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBegkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.CallActivity_Action" name="CallActivity Action" xmi:id="_ulhBewkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBfAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBfQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.CallActivity_ActivityNode" name="CallActivity ActivityNode" xmi:id="_ulhBfgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBfwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBgAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallActivity_Element" name="CallActivity Element" xmi:id="_ulhBgQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBggkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBgwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.ResourceRole_Property" name="ResourceRole Property" xmi:id="_ulhBhAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhBhQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBhgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceRole</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceRole_Element" name="ResourceRole Element" xmi:id="_ulhBhwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBiAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBiQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceRole</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction" name="BusinessRuleTask OpaqueAction" xmi:id="_ulhBigkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhBiwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBjAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_Action" name="BusinessRuleTask Action" xmi:id="_ulhBjQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBjgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBjwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_ActivityNode" name="BusinessRuleTask ActivityNode" xmi:id="_ulhBkAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBkQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBkgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_Element" name="BusinessRuleTask Element" xmi:id="_ulhBkwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBlAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBlQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ControlFlow" identifier="org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_ControlFlow" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_ulhBlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_ulhBlwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBmAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexBehaviorDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_Element" name="ComplexBehaviorDefinition Element" xmi:id="_ulhBmQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBmgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBmwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ComplexBehaviorDefinition</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.ResourceAssignmentExpression_OpaqueExpression" name="ResourceAssignmentExpression OpaqueExpression" xmi:id="_ulhBnAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulhBnQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBngkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceAssignmentExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceAssignmentExpression_Element" name="ResourceAssignmentExpression Element" xmi:id="_ulhBnwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBoAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBoQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceAssignmentExpression</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_StructuredActivityNode" name="AdHocSubProcess StructuredActivityNode" xmi:id="_ulhBogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhBowkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBpAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_Action" name="AdHocSubProcess Action" xmi:id="_ulhBpQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBpgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBpwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_ActivityNode" name="AdHocSubProcess ActivityNode" xmi:id="_ulhBqAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBqQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBqgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_Element" name="AdHocSubProcess Element" xmi:id="_ulhBqwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBrAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBrQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction" name="ScriptTask OpaqueAction" xmi:id="_ulhBrgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhBrwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBsAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ScriptTask_Action" name="ScriptTask Action" xmi:id="_ulhBsQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBsgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBswkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ScriptTask_ActivityNode" name="ScriptTask ActivityNode" xmi:id="_ulhBtAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBtQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBtgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ScriptTask_Element" name="ScriptTask Element" xmi:id="_ulhBtwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBuAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBuQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.Task_Action" name="Task Action" xmi:id="_ulhBugkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBuwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBvAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Task_ActivityNode" name="Task ActivityNode" xmi:id="_ulhBvQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBvgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBvwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Task_Element" name="Task Element" xmi:id="_ulhBwAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBwQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBwgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.SendTask_CallOperationAction" name="SendTask CallOperationAction" xmi:id="_ulhBwwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulhBxAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBxQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.SendTask_Action" name="SendTask Action" xmi:id="_ulhBxgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBxwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhByAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.SendTask_ActivityNode" name="SendTask ActivityNode" xmi:id="_ulhByQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBygkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBywkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SendTask_Element" name="SendTask Element" xmi:id="_ulhBzAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBzQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBzgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.Transaction_StructuredActivityNode" name="Transaction StructuredActivityNode" xmi:id="_ulhBzwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhB0AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB0QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.Transaction_Action" name="Transaction Action" xmi:id="_ulhB0gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhB0wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB1AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Transaction_ActivityNode" name="Transaction ActivityNode" xmi:id="_ulhB1QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhB1gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB1wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Transaction_Element" name="Transaction Element" xmi:id="_ulhB2AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB2QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB2gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::LoopNode" identifier="org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_LoopNode" name="StandardLoopCharacteristics LoopNode" xmi:id="_ulhB2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_ulhB3AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LoopNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB3QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StandardLoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_StructuredActivityNode" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_ulhB3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhB3wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB4AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StandardLoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_Element" name="StandardLoopCharacteristics Element" xmi:id="_ulhB4QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB4gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB4wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::StandardLoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_AcceptEventAction" name="ReceiveTask AcceptEventAction" xmi:id="_ulhB5AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulhB5QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB5gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_Action" name="ReceiveTask Action" xmi:id="_ulhB5wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhB6AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB6QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_ActivityNode" name="ReceiveTask ActivityNode" xmi:id="_ulhB6gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhB6wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB7AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_Element" name="ReceiveTask Element" xmi:id="_ulhB7QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB7gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB7wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Slot" identifier="org.eclipse.papyrus.bpmn.ResourceParameterBinding_Slot" name="ResourceParameterBinding Slot" xmi:id="_ulhB8AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_ulhB8QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB8gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceParameterBinding</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceParameterBinding_Element" name="ResourceParameterBinding Element" xmi:id="_ulhB8wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB9AkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB9QkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ResourceParameterBinding</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction" name="ServiceTask CallOperationAction" xmi:id="_ulhB9gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulhB9wkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB-AkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ServiceTask_Action" name="ServiceTask Action" xmi:id="_ulhB-QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhB-gkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB-wkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ServiceTask_ActivityNode" name="ServiceTask ActivityNode" xmi:id="_ulhB_AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhB_QkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhB_gkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ServiceTask_Element" name="ServiceTask Element" xmi:id="_ulhB_wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhCAAkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhCAQkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ExpansionRegion" identifier="org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_ExpansionRegion" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_ulhCAgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_ulhCAwkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionRegion</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhCBAkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MultiInstanceLoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_StructuredActivityNode" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_ulhCBQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhCBgkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhCBwkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MultiInstanceLoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_Element" name="MultiInstanceLoopCharacteristics Element" xmi:id="_ulhCCAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhCCQkFEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhCCgkFEeWVleXnap4Kwg" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::MultiInstanceLoopCharacteristics</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXkQkFEeWVleXnap4Kwg" xmi:id="_ulhCCwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCDAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXlAkFEeWVleXnap4Kwg" xmi:id="_ulhCDQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCDgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXlwkFEeWVleXnap4Kwg" xmi:id="_ulhCDwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCEAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXmgkFEeWVleXnap4Kwg" xmi:id="_ulhCEQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCEgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXnQkFEeWVleXnap4Kwg" xmi:id="_ulhCEwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCFAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXoAkFEeWVleXnap4Kwg" xmi:id="_ulhCFQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCFgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXowkFEeWVleXnap4Kwg" xmi:id="_ulhCFwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCGAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXpgkFEeWVleXnap4Kwg" xmi:id="_ulhCGQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCGgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXqQkFEeWVleXnap4Kwg" xmi:id="_ulhCGwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCHAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXrAkFEeWVleXnap4Kwg" xmi:id="_ulhCHQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCHgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXrwkFEeWVleXnap4Kwg" xmi:id="_ulhCHwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCIAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXsgkFEeWVleXnap4Kwg" xmi:id="_ulhCIQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCIgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXtQkFEeWVleXnap4Kwg" xmi:id="_ulhCIwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCJAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXuAkFEeWVleXnap4Kwg" xmi:id="_ulhCJQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCJgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXuwkFEeWVleXnap4Kwg" xmi:id="_ulhCJwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCKAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXvgkFEeWVleXnap4Kwg" xmi:id="_ulhCKQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCKgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXwQkFEeWVleXnap4Kwg" xmi:id="_ulhCKwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCLAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXxAkFEeWVleXnap4Kwg" xmi:id="_ulhCLQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCLgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXxwkFEeWVleXnap4Kwg" xmi:id="_ulhCLwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCMAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXygkFEeWVleXnap4Kwg" xmi:id="_ulhCMQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCMgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXzQkFEeWVleXnap4Kwg" xmi:id="_ulhCMwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCNAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgX0AkFEeWVleXnap4Kwg" xmi:id="_ulhCNQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCNgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgX0wkFEeWVleXnap4Kwg" xmi:id="_ulhCNwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCOAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX1gkFEeWVleXnap4Kwg" xmi:id="_ulhCOQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCOgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX2QkFEeWVleXnap4Kwg" xmi:id="_ulhCOwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCPAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX3AkFEeWVleXnap4Kwg" xmi:id="_ulhCPQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCPgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX3wkFEeWVleXnap4Kwg" xmi:id="_ulhCPwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCQAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX4gkFEeWVleXnap4Kwg" xmi:id="_ulhCQQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCQgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX5QkFEeWVleXnap4Kwg" xmi:id="_ulhCQwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCRAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX6AkFEeWVleXnap4Kwg" xmi:id="_ulhCRQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCRgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX6wkFEeWVleXnap4Kwg" xmi:id="_ulhCRwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCSAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX7gkFEeWVleXnap4Kwg" xmi:id="_ulhCSQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCSgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX8QkFEeWVleXnap4Kwg" xmi:id="_ulhCSwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCTAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX9AkFEeWVleXnap4Kwg" xmi:id="_ulhCTQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCTgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX9wkFEeWVleXnap4Kwg" xmi:id="_ulhCTwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCUAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgX-gkFEeWVleXnap4Kwg" xmi:id="_ulhCUQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCUgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgX_QkFEeWVleXnap4Kwg" xmi:id="_ulhCUwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCVAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYAAkFEeWVleXnap4Kwg" xmi:id="_ulhCVQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCVgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYAwkFEeWVleXnap4Kwg" xmi:id="_ulhCVwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCWAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYBgkFEeWVleXnap4Kwg" xmi:id="_ulhCWQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCWgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYCQkFEeWVleXnap4Kwg" xmi:id="_ulhCWwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCXAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rootElement" target="_ulgYDAkFEeWVleXnap4Kwg" xmi:id="_ulhCXQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::RootElement" updateName="true" xmi:id="_ulhCXgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rootElement" target="_ulgYDwkFEeWVleXnap4Kwg" xmi:id="_ulhCXwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::RootElement" updateName="true" xmi:id="_ulhCYAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.import_UML::PackageImport" target="_ulgYEgkFEeWVleXnap4Kwg" xmi:id="_ulhCYQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Import" updateName="true" xmi:id="_ulhCYgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.definitions" target="_ulgYFQkFEeWVleXnap4Kwg" xmi:id="_ulhCYwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_ulhCZAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.definitions" target="_ulgYGAkFEeWVleXnap4Kwg" xmi:id="_ulhCZQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_ulhCZgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.laneSet" target="_ulgYGwkFEeWVleXnap4Kwg" xmi:id="_ulhCZwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LaneSet" updateName="true" xmi:id="_ulhCaAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.laneSet" target="_ulgYHgkFEeWVleXnap4Kwg" xmi:id="_ulhCaQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LaneSet" updateName="true" xmi:id="_ulhCagkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.monitoring" target="_ulgYIQkFEeWVleXnap4Kwg" xmi:id="_ulhCawkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Monitoring" updateName="true" xmi:id="_ulhCbAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.monitoring" target="_ulgYJAkFEeWVleXnap4Kwg" xmi:id="_ulhCbQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Monitoring" updateName="true" xmi:id="_ulhCbgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYJwkFEeWVleXnap4Kwg" xmi:id="_ulhCbwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCcAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYKgkFEeWVleXnap4Kwg" xmi:id="_ulhCcQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCcgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYLQkFEeWVleXnap4Kwg" xmi:id="_ulhCcwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCdAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYMAkFEeWVleXnap4Kwg" xmi:id="_ulhCdQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCdgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.lane" target="_ulgYMwkFEeWVleXnap4Kwg" xmi:id="_ulhCdwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Lane" updateName="true" xmi:id="_ulhCeAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.lane" target="_ulgYNgkFEeWVleXnap4Kwg" xmi:id="_ulhCeQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Lane" updateName="true" xmi:id="_ulhCegkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYOQkFEeWVleXnap4Kwg" xmi:id="_ulhCewkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCfAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYPAkFEeWVleXnap4Kwg" xmi:id="_ulhCfQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCfgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYPwkFEeWVleXnap4Kwg" xmi:id="_ulhCfwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCgAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYQgkFEeWVleXnap4Kwg" xmi:id="_ulhCgQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCggkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.auditing" target="_ulgYRQkFEeWVleXnap4Kwg" xmi:id="_ulhCgwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Auditing" updateName="true" xmi:id="_ulhChAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.auditing" target="_ulgYSAkFEeWVleXnap4Kwg" xmi:id="_ulhChQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Auditing" updateName="true" xmi:id="_ulhChgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYSwkFEeWVleXnap4Kwg" xmi:id="_ulhChwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCiAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYTgkFEeWVleXnap4Kwg" xmi:id="_ulhCiQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCigkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYUQkFEeWVleXnap4Kwg" xmi:id="_ulhCiwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCjAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYVAkFEeWVleXnap4Kwg" xmi:id="_ulhCjQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCjgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYVwkFEeWVleXnap4Kwg" xmi:id="_ulhCjwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhCkAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYWgkFEeWVleXnap4Kwg" xmi:id="_ulhCkQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhCkgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYXQkFEeWVleXnap4Kwg" xmi:id="_ulhCkwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhClAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYYAkFEeWVleXnap4Kwg" xmi:id="_ulhClQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhClgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYYwkFEeWVleXnap4Kwg" xmi:id="_ulhClwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCmAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYZgkFEeWVleXnap4Kwg" xmi:id="_ulhCmQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCmgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYaQkFEeWVleXnap4Kwg" xmi:id="_ulhCmwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCnAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYbAkFEeWVleXnap4Kwg" xmi:id="_ulhCnQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCngkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYbwkFEeWVleXnap4Kwg" xmi:id="_ulhCnwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCoAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYcgkFEeWVleXnap4Kwg" xmi:id="_ulhCoQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCogkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYdQkFEeWVleXnap4Kwg" xmi:id="_ulhCowkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCpAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYeAkFEeWVleXnap4Kwg" xmi:id="_ulhCpQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCpgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYewkFEeWVleXnap4Kwg" xmi:id="_ulhCpwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCqAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYfgkFEeWVleXnap4Kwg" xmi:id="_ulhCqQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCqgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYgQkFEeWVleXnap4Kwg" xmi:id="_ulhCqwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCrAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYhAkFEeWVleXnap4Kwg" xmi:id="_ulhCrQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCrgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYhwkFEeWVleXnap4Kwg" xmi:id="_ulhCrwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCsAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYigkFEeWVleXnap4Kwg" xmi:id="_ulhCsQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCsgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYjQkFEeWVleXnap4Kwg" xmi:id="_ulhCswkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCtAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYkAkFEeWVleXnap4Kwg" xmi:id="_ulhCtQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCtgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulgYkwkFEeWVleXnap4Kwg" xmi:id="_ulhCtwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCuAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulgYlgkFEeWVleXnap4Kwg" xmi:id="_ulhCuQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCugkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulg-ogkFEeWVleXnap4Kwg" xmi:id="_ulhCuwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCvAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulg-pQkFEeWVleXnap4Kwg" xmi:id="_ulhCvQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCvgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulg-qAkFEeWVleXnap4Kwg" xmi:id="_ulhCvwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCwAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventDefinition" target="_ulg-qwkFEeWVleXnap4Kwg" xmi:id="_ulhCwQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventDefinition" updateName="true" xmi:id="_ulhCwgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventDefinition" target="_ulg-rgkFEeWVleXnap4Kwg" xmi:id="_ulhCwwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventDefinition" updateName="true" xmi:id="_ulhCxAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventDefinition" target="_ulg-sQkFEeWVleXnap4Kwg" xmi:id="_ulhCxQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventDefinition" updateName="true" xmi:id="_ulhCxgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNEvent" target="_ulg-tAkFEeWVleXnap4Kwg" xmi:id="_ulhCxwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNEvent" updateName="true" xmi:id="_ulhCyAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNEvent" target="_ulg-twkFEeWVleXnap4Kwg" xmi:id="_ulhCyQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNEvent" updateName="true" xmi:id="_ulhCygkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.error" target="_ulg-ugkFEeWVleXnap4Kwg" xmi:id="_ulhCywkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Error" updateName="true" xmi:id="_ulhCzAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.error" target="_ulg-vQkFEeWVleXnap4Kwg" xmi:id="_ulhCzQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Error" updateName="true" xmi:id="_ulhCzgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.error" target="_ulg-wAkFEeWVleXnap4Kwg" xmi:id="_ulhCzwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Error" updateName="true" xmi:id="_ulhC0AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-wwkFEeWVleXnap4Kwg" xmi:id="_ulhC0QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC0gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-xgkFEeWVleXnap4Kwg" xmi:id="_ulhC0wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC1AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-yQkFEeWVleXnap4Kwg" xmi:id="_ulhC1QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC1gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-zAkFEeWVleXnap4Kwg" xmi:id="_ulhC1wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC2AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-zwkFEeWVleXnap4Kwg" xmi:id="_ulhC2QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC2gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-0gkFEeWVleXnap4Kwg" xmi:id="_ulhC2wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC3AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-1QkFEeWVleXnap4Kwg" xmi:id="_ulhC3QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC3gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-2AkFEeWVleXnap4Kwg" xmi:id="_ulhC3wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC4AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-2wkFEeWVleXnap4Kwg" xmi:id="_ulhC4QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC4gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-3gkFEeWVleXnap4Kwg" xmi:id="_ulhC4wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC5AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-4QkFEeWVleXnap4Kwg" xmi:id="_ulhC5QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC5gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-5AkFEeWVleXnap4Kwg" xmi:id="_ulhC5wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC6AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNSignal" target="_ulg-5wkFEeWVleXnap4Kwg" xmi:id="_ulhC6QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNSignal" updateName="true" xmi:id="_ulhC6gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNSignal" target="_ulg-6gkFEeWVleXnap4Kwg" xmi:id="_ulhC6wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNSignal" updateName="true" xmi:id="_ulhC7AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNSignal" target="_ulg-7QkFEeWVleXnap4Kwg" xmi:id="_ulhC7QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNSignal" updateName="true" xmi:id="_ulhC7gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg-8AkFEeWVleXnap4Kwg" xmi:id="_ulhC7wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC8AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg-8wkFEeWVleXnap4Kwg" xmi:id="_ulhC8QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC8gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg-9gkFEeWVleXnap4Kwg" xmi:id="_ulhC8wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC9AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg--QkFEeWVleXnap4Kwg" xmi:id="_ulhC9QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC9gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg-_AkFEeWVleXnap4Kwg" xmi:id="_ulhC9wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC-AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg-_wkFEeWVleXnap4Kwg" xmi:id="_ulhC-QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC-gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg_AgkFEeWVleXnap4Kwg" xmi:id="_ulhC-wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC_AkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg_BQkFEeWVleXnap4Kwg" xmi:id="_ulhC_QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC_gkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_CAkFEeWVleXnap4Kwg" xmi:id="_ulhC_wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDAAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_CwkFEeWVleXnap4Kwg" xmi:id="_ulhDAQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDAgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_DgkFEeWVleXnap4Kwg" xmi:id="_ulhDAwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDBAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_EQkFEeWVleXnap4Kwg" xmi:id="_ulhDBQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDBgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_FAkFEeWVleXnap4Kwg" xmi:id="_ulhDBwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDCAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_FwkFEeWVleXnap4Kwg" xmi:id="_ulhDCQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDCgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_GgkFEeWVleXnap4Kwg" xmi:id="_ulhDCwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDDAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_HQkFEeWVleXnap4Kwg" xmi:id="_ulhDDQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDDgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_IAkFEeWVleXnap4Kwg" xmi:id="_ulhDDwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDEAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_IwkFEeWVleXnap4Kwg" xmi:id="_ulhDEQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDEgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_JgkFEeWVleXnap4Kwg" xmi:id="_ulhDEwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDFAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_KQkFEeWVleXnap4Kwg" xmi:id="_ulhDFQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDFgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_LAkFEeWVleXnap4Kwg" xmi:id="_ulhDFwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDGAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_LwkFEeWVleXnap4Kwg" xmi:id="_ulhDGQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDGgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_MgkFEeWVleXnap4Kwg" xmi:id="_ulhDGwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDHAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_NQkFEeWVleXnap4Kwg" xmi:id="_ulhDHQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDHgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_OAkFEeWVleXnap4Kwg" xmi:id="_ulhDHwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDIAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_OwkFEeWVleXnap4Kwg" xmi:id="_ulhDIQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDIgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_PgkFEeWVleXnap4Kwg" xmi:id="_ulhDIwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDJAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_QQkFEeWVleXnap4Kwg" xmi:id="_ulhDJQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDJgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_RAkFEeWVleXnap4Kwg" xmi:id="_ulhDJwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDKAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_RwkFEeWVleXnap4Kwg" xmi:id="_ulhDKQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDKgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_SgkFEeWVleXnap4Kwg" xmi:id="_ulhDKwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDLAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_TQkFEeWVleXnap4Kwg" xmi:id="_ulhDLQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDLgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_UAkFEeWVleXnap4Kwg" xmi:id="_ulhDLwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDMAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_UwkFEeWVleXnap4Kwg" xmi:id="_ulhDMQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDMgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_VgkFEeWVleXnap4Kwg" xmi:id="_ulhDMwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDNAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_WQkFEeWVleXnap4Kwg" xmi:id="_ulhDNQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDNgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_XAkFEeWVleXnap4Kwg" xmi:id="_ulhDNwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDOAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_XwkFEeWVleXnap4Kwg" xmi:id="_ulhDOQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDOgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_YgkFEeWVleXnap4Kwg" xmi:id="_ulhDOwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDPAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_ZQkFEeWVleXnap4Kwg" xmi:id="_ulhDPQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDPgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_aAkFEeWVleXnap4Kwg" xmi:id="_ulhDPwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDQAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalation" target="_ulg_awkFEeWVleXnap4Kwg" xmi:id="_ulhDQQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Escalation" updateName="true" xmi:id="_ulhDQgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalation" target="_ulg_bgkFEeWVleXnap4Kwg" xmi:id="_ulhDQwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Escalation" updateName="true" xmi:id="_ulhDRAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalation" target="_ulg_cQkFEeWVleXnap4Kwg" xmi:id="_ulhDRQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Escalation" updateName="true" xmi:id="_ulhDRgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.textAnnotation" target="_ulg_dAkFEeWVleXnap4Kwg" xmi:id="_ulhDRwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TextAnnotation" updateName="true" xmi:id="_ulhDSAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.textAnnotation" target="_ulg_dwkFEeWVleXnap4Kwg" xmi:id="_ulhDSQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TextAnnotation" updateName="true" xmi:id="_ulhDSgkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.category" target="_ulg_egkFEeWVleXnap4Kwg" xmi:id="_ulhDSwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Category" updateName="true" xmi:id="_ulhDTAkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.category" target="_ulg_fQkFEeWVleXnap4Kwg" xmi:id="_ulhlsAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Category" updateName="true" xmi:id="_ulhlsQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.category" target="_ulg_gAkFEeWVleXnap4Kwg" xmi:id="_ulhlsgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Category" updateName="true" xmi:id="_ulhlswkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNAssociation" target="_ulg_gwkFEeWVleXnap4Kwg" xmi:id="_ulhltAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNAssociation" updateName="true" xmi:id="_ulhltQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNAssociation" target="_ulg_hgkFEeWVleXnap4Kwg" xmi:id="_ulhltgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNAssociation" updateName="true" xmi:id="_ulhltwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.group" target="_ulg_iQkFEeWVleXnap4Kwg" xmi:id="_ulhluAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Group" updateName="true" xmi:id="_ulhluQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.group" target="_ulg_jAkFEeWVleXnap4Kwg" xmi:id="_ulhlugkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Group" updateName="true" xmi:id="_ulhluwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.categoryValue" target="_ulg_jwkFEeWVleXnap4Kwg" xmi:id="_ulhlvAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CategoryValue" updateName="true" xmi:id="_ulhlvQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.categoryValue" target="_ulg_kgkFEeWVleXnap4Kwg" xmi:id="_ulhlvgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CategoryValue" updateName="true" xmi:id="_ulhlvwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNArtifact" target="_ulg_lQkFEeWVleXnap4Kwg" xmi:id="_ulhlwAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNArtifact" updateName="true" xmi:id="_ulhlwQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowNode" target="_ulg_mAkFEeWVleXnap4Kwg" xmi:id="_ulhlwgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowNode" updateName="true" xmi:id="_ulhlwwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowNode" target="_ulg_mwkFEeWVleXnap4Kwg" xmi:id="_ulhlxAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowNode" updateName="true" xmi:id="_ulhlxQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.formalExpression" target="_ulg_ngkFEeWVleXnap4Kwg" xmi:id="_ulhlxgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FormalExpression" updateName="true" xmi:id="_ulhlxwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.formalExpression" target="_ulg_oQkFEeWVleXnap4Kwg" xmi:id="_ulhlyAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FormalExpression" updateName="true" xmi:id="_ulhlyQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resource" target="_ulg_pAkFEeWVleXnap4Kwg" xmi:id="_ulhlygkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Resource" updateName="true" xmi:id="_ulhlywkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resource" target="_ulg_pwkFEeWVleXnap4Kwg" xmi:id="_ulhlzAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Resource" updateName="true" xmi:id="_ulhlzQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resource" target="_ulg_qgkFEeWVleXnap4Kwg" xmi:id="_ulhlzgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Resource" updateName="true" xmi:id="_ulhlzwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowElement" target="_ulg_rQkFEeWVleXnap4Kwg" xmi:id="_ulhl0AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowElement" updateName="true" xmi:id="_ulhl0QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyBinding" target="_ulg_sAkFEeWVleXnap4Kwg" xmi:id="_ulhl0gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyBinding" updateName="true" xmi:id="_ulhl0wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyBinding" target="_ulg_swkFEeWVleXnap4Kwg" xmi:id="_ulhl1AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyBinding" updateName="true" xmi:id="_ulhl1QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationSubscription" target="_ulg_tgkFEeWVleXnap4Kwg" xmi:id="_ulhl1gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationSubscription" updateName="true" xmi:id="_ulhl1wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationSubscription" target="_ulg_uQkFEeWVleXnap4Kwg" xmi:id="_ulhl2AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationSubscription" updateName="true" xmi:id="_ulhl2QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callableElement" target="_ulg_vAkFEeWVleXnap4Kwg" xmi:id="_ulhl2gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallableElement" updateName="true" xmi:id="_ulhl2wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callableElement" target="_ulg_vwkFEeWVleXnap4Kwg" xmi:id="_ulhl3AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallableElement" updateName="true" xmi:id="_ulhl3QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callableElement" target="_ulg_wgkFEeWVleXnap4Kwg" xmi:id="_ulhl3gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallableElement" updateName="true" xmi:id="_ulhl3wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sequenceFlow" target="_ulg_xQkFEeWVleXnap4Kwg" xmi:id="_ulhl4AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SequenceFlow" updateName="true" xmi:id="_ulhl4QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sequenceFlow" target="_ulg_yAkFEeWVleXnap4Kwg" xmi:id="_ulhl4gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SequenceFlow" updateName="true" xmi:id="_ulhl4wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyRetrievalExpression" target="_ulg_ywkFEeWVleXnap4Kwg" xmi:id="_ulhl5AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyRetrievalExpression" updateName="true" xmi:id="_ulhl5QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyRetrievalExpression" target="_ulg_zgkFEeWVleXnap4Kwg" xmi:id="_ulhl5gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyRetrievalExpression" updateName="true" xmi:id="_ulhl5wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNExpression" target="_ulg_0QkFEeWVleXnap4Kwg" xmi:id="_ulhl6AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNExpression" updateName="true" xmi:id="_ulhl6QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNExpression" target="_ulg_1AkFEeWVleXnap4Kwg" xmi:id="_ulhl6gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNExpression" updateName="true" xmi:id="_ulhl6wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationProperty" target="_ulg_1wkFEeWVleXnap4Kwg" xmi:id="_ulhl7AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationProperty" updateName="true" xmi:id="_ulhl7QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationProperty" target="_ulg_2gkFEeWVleXnap4Kwg" xmi:id="_ulhl7gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationProperty" updateName="true" xmi:id="_ulhl7wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemDefinition" target="_ulg_3QkFEeWVleXnap4Kwg" xmi:id="_ulhl8AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemDefinition" updateName="true" xmi:id="_ulhl8QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemDefinition" target="_ulg_4AkFEeWVleXnap4Kwg" xmi:id="_ulhl8gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemDefinition" updateName="true" xmi:id="_ulhl8wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemDefinition" target="_ulg_4wkFEeWVleXnap4Kwg" xmi:id="_ulhl9AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemDefinition" updateName="true" xmi:id="_ulhl9QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationKey" target="_ulg_5gkFEeWVleXnap4Kwg" xmi:id="_ulhl9gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationKey" updateName="true" xmi:id="_ulhl9wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationKey" target="_ulg_6QkFEeWVleXnap4Kwg" xmi:id="_ulhl-AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationKey" updateName="true" xmi:id="_ulhl-QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowElementsContainer" target="_ulg_7AkFEeWVleXnap4Kwg" xmi:id="_ulhl-gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowElementsContainer" updateName="true" xmi:id="_ulhl-wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNMessage" target="_ulg_7wkFEeWVleXnap4Kwg" xmi:id="_ulhl_AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNMessage" updateName="true" xmi:id="_ulhl_QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNMessage" target="_ulg_8gkFEeWVleXnap4Kwg" xmi:id="_ulhl_gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNMessage" updateName="true" xmi:id="_ulhl_wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNMessage" target="_ulg_9QkFEeWVleXnap4Kwg" xmi:id="_ulhmAAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNMessage" updateName="true" xmi:id="_ulhmAQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameter" target="_ulg_-AkFEeWVleXnap4Kwg" xmi:id="_ulhmAgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameter" updateName="true" xmi:id="_ulhmAwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameter" target="_ulg_-wkFEeWVleXnap4Kwg" xmi:id="_ulhmBAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameter" updateName="true" xmi:id="_ulhmBQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.outputSet" target="_ulg__gkFEeWVleXnap4Kwg" xmi:id="_ulhmBgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::OutputSet" updateName="true" xmi:id="_ulhmBwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.outputSet" target="_ulhAAQkFEeWVleXnap4Kwg" xmi:id="_ulhmCAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::OutputSet" updateName="true" xmi:id="_ulhmCQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputSet" target="_ulhABAkFEeWVleXnap4Kwg" xmi:id="_ulhmCgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputSet" updateName="true" xmi:id="_ulhmCwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputSet" target="_ulhABwkFEeWVleXnap4Kwg" xmi:id="_ulhmDAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputSet" updateName="true" xmi:id="_ulhmDQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataState" target="_ulhACgkFEeWVleXnap4Kwg" xmi:id="_ulhmDgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataState" updateName="true" xmi:id="_ulhmDwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataState" target="_ulhADQkFEeWVleXnap4Kwg" xmi:id="_ulhmEAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataState" updateName="true" xmi:id="_ulhmEQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObjectReference" target="_ulhAEAkFEeWVleXnap4Kwg" xmi:id="_ulhmEgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObjectReference" updateName="true" xmi:id="_ulhmEwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObjectReference" target="_ulhAEwkFEeWVleXnap4Kwg" xmi:id="_ulhmFAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObjectReference" updateName="true" xmi:id="_ulhmFQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObjectReference" target="_ulhAFgkFEeWVleXnap4Kwg" xmi:id="_ulhmFgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObjectReference" updateName="true" xmi:id="_ulhmFwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutputAssociation" target="_ulhAGQkFEeWVleXnap4Kwg" xmi:id="_ulhmGAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutputAssociation" updateName="true" xmi:id="_ulhmGQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutputAssociation" target="_ulhAHAkFEeWVleXnap4Kwg" xmi:id="_ulhmGgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutputAssociation" updateName="true" xmi:id="_ulhmGwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputBinding" target="_ulhAHwkFEeWVleXnap4Kwg" xmi:id="_ulhmHAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputBinding" updateName="true" xmi:id="_ulhmHQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputBinding" target="_ulhAIgkFEeWVleXnap4Kwg" xmi:id="_ulhmHgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputBinding" updateName="true" xmi:id="_ulhmHwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.assignment" target="_ulhAJQkFEeWVleXnap4Kwg" xmi:id="_ulhmIAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Assignment" updateName="true" xmi:id="_ulhmIQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.assignment" target="_ulhAKAkFEeWVleXnap4Kwg" xmi:id="_ulhmIgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Assignment" updateName="true" xmi:id="_ulhmIwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhAKwkFEeWVleXnap4Kwg" xmi:id="_ulhmJAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmJQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhALgkFEeWVleXnap4Kwg" xmi:id="_ulhmJgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmJwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhAMQkFEeWVleXnap4Kwg" xmi:id="_ulhmKAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmKQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhANAkFEeWVleXnap4Kwg" xmi:id="_ulhmKgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmKwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhANwkFEeWVleXnap4Kwg" xmi:id="_ulhmLAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmLQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProperty" target="_ulhAOgkFEeWVleXnap4Kwg" xmi:id="_ulhmLgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProperty" updateName="true" xmi:id="_ulhmLwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProperty" target="_ulhAPQkFEeWVleXnap4Kwg" xmi:id="_ulhmMAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProperty" updateName="true" xmi:id="_ulhmMQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProperty" target="_ulhAQAkFEeWVleXnap4Kwg" xmi:id="_ulhmMgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProperty" updateName="true" xmi:id="_ulhmMwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemAwareElement" target="_ulhAQwkFEeWVleXnap4Kwg" xmi:id="_ulhmNAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemAwareElement" updateName="true" xmi:id="_ulhmNQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemAwareElement" target="_ulhARgkFEeWVleXnap4Kwg" xmi:id="_ulhmNgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemAwareElement" updateName="true" xmi:id="_ulhmNwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputSpecification" target="_ulhASQkFEeWVleXnap4Kwg" xmi:id="_ulhmOAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputSpecification" updateName="true" xmi:id="_ulhmOQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputSpecification" target="_ulhATAkFEeWVleXnap4Kwg" xmi:id="_ulhmOgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputSpecification" updateName="true" xmi:id="_ulhmOwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputSpecification" target="_ulhATwkFEeWVleXnap4Kwg" xmi:id="_ulhmPAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputSpecification" updateName="true" xmi:id="_ulhmPQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStore" target="_ulhAUgkFEeWVleXnap4Kwg" xmi:id="_ulhmPgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStore" updateName="true" xmi:id="_ulhmPwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStore" target="_ulhAVQkFEeWVleXnap4Kwg" xmi:id="_ulhmQAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStore" updateName="true" xmi:id="_ulhmQQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStore" target="_ulhAWAkFEeWVleXnap4Kwg" xmi:id="_ulhmQgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStore" updateName="true" xmi:id="_ulhmQwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInputAssociation" target="_ulhAWwkFEeWVleXnap4Kwg" xmi:id="_ulhmRAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInputAssociation" updateName="true" xmi:id="_ulhmRQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInputAssociation" target="_ulhAXgkFEeWVleXnap4Kwg" xmi:id="_ulhmRgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInputAssociation" updateName="true" xmi:id="_ulhmRwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStoreReference" target="_ulhAYQkFEeWVleXnap4Kwg" xmi:id="_ulhmSAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStoreReference" updateName="true" xmi:id="_ulhmSQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStoreReference" target="_ulhAZAkFEeWVleXnap4Kwg" xmi:id="_ulhmSgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStoreReference" updateName="true" xmi:id="_ulhmSwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStoreReference" target="_ulhAZwkFEeWVleXnap4Kwg" xmi:id="_ulhmTAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStoreReference" updateName="true" xmi:id="_ulhmTQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObject" target="_ulhAagkFEeWVleXnap4Kwg" xmi:id="_ulhmTgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObject" updateName="true" xmi:id="_ulhmTwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObject" target="_ulhAbQkFEeWVleXnap4Kwg" xmi:id="_ulhmUAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObject" updateName="true" xmi:id="_ulhmUQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObject" target="_ulhAcAkFEeWVleXnap4Kwg" xmi:id="_ulhmUgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObject" updateName="true" xmi:id="_ulhmUwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAcwkFEeWVleXnap4Kwg" xmi:id="_ulhmVAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmVQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAdgkFEeWVleXnap4Kwg" xmi:id="_ulhmVgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmVwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAeQkFEeWVleXnap4Kwg" xmi:id="_ulhmWAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmWQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAfAkFEeWVleXnap4Kwg" xmi:id="_ulhmWgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmWwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAfwkFEeWVleXnap4Kwg" xmi:id="_ulhmXAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmXQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataAssociation" target="_ulhAggkFEeWVleXnap4Kwg" xmi:id="_ulhmXgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataAssociation" updateName="true" xmi:id="_ulhmXwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataAssociation" target="_ulhAhQkFEeWVleXnap4Kwg" xmi:id="_ulhmYAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataAssociation" updateName="true" xmi:id="_ulhmYQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAiAkFEeWVleXnap4Kwg" xmi:id="_ulhmYgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmYwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAiwkFEeWVleXnap4Kwg" xmi:id="_ulhmZAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmZQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAjgkFEeWVleXnap4Kwg" xmi:id="_ulhmZgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmZwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAkQkFEeWVleXnap4Kwg" xmi:id="_ulhmaAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmaQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.humanPerformer" target="_ulhAlAkFEeWVleXnap4Kwg" xmi:id="_ulhmagkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::HumanPerformer" updateName="true" xmi:id="_ulhmawkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.humanPerformer" target="_ulhAlwkFEeWVleXnap4Kwg" xmi:id="_ulhmbAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::HumanPerformer" updateName="true" xmi:id="_ulhmbQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAmgkFEeWVleXnap4Kwg" xmi:id="_ulhmbgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmbwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAnQkFEeWVleXnap4Kwg" xmi:id="_ulhmcAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmcQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAoAkFEeWVleXnap4Kwg" xmi:id="_ulhmcgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmcwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAowkFEeWVleXnap4Kwg" xmi:id="_ulhmdAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmdQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rendering" target="_ulhApgkFEeWVleXnap4Kwg" xmi:id="_ulhmdgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Rendering" updateName="true" xmi:id="_ulhmdwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rendering" target="_ulhAqQkFEeWVleXnap4Kwg" xmi:id="_ulhmeAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Rendering" updateName="true" xmi:id="_ulhmeQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhArAkFEeWVleXnap4Kwg" xmi:id="_ulhmegkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmewkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhArwkFEeWVleXnap4Kwg" xmi:id="_ulhmfAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmfQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhAsgkFEeWVleXnap4Kwg" xmi:id="_ulhmfgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmfwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhAtQkFEeWVleXnap4Kwg" xmi:id="_ulhmgAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmgQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAuAkFEeWVleXnap4Kwg" xmi:id="_ulhmggkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmgwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAuwkFEeWVleXnap4Kwg" xmi:id="_ulhmhAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmhQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAvgkFEeWVleXnap4Kwg" xmi:id="_ulhmhgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmhwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAwQkFEeWVleXnap4Kwg" xmi:id="_ulhmiAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmiQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.potentialOwner" target="_ulhAxAkFEeWVleXnap4Kwg" xmi:id="_ulhmigkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PotentialOwner" updateName="true" xmi:id="_ulhmiwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.potentialOwner" target="_ulhAxwkFEeWVleXnap4Kwg" xmi:id="_ulhmjAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PotentialOwner" updateName="true" xmi:id="_ulhmjQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.interactionNode" target="_ulhAygkFEeWVleXnap4Kwg" xmi:id="_ulhmjgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InteractionNode" updateName="true" xmi:id="_ulhmjwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participant" target="_ulhAzQkFEeWVleXnap4Kwg" xmi:id="_ulhmkAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Participant" updateName="true" xmi:id="_ulhmkQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participant" target="_ulhA0AkFEeWVleXnap4Kwg" xmi:id="_ulhmkgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Participant" updateName="true" xmi:id="_ulhmkwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerRole" target="_ulhA0wkFEeWVleXnap4Kwg" xmi:id="_ulhmlAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerRole" updateName="true" xmi:id="_ulhmlQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerRole" target="_ulhA1gkFEeWVleXnap4Kwg" xmi:id="_ulhmlgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerRole" updateName="true" xmi:id="_ulhmlwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerRole" target="_ulhA2QkFEeWVleXnap4Kwg" xmi:id="_ulhmmAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerRole" updateName="true" xmi:id="_ulhmmQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlow_UML::InformationFlow" target="_ulhA3AkFEeWVleXnap4Kwg" xmi:id="_ulhmmgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlow" updateName="true" xmi:id="_ulhmmwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlow" target="_ulhA3wkFEeWVleXnap4Kwg" xmi:id="_ulhmnAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlow" updateName="true" xmi:id="_ulhmnQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNCollaboration" target="_ulhA4gkFEeWVleXnap4Kwg" xmi:id="_ulhmngkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNCollaboration" updateName="true" xmi:id="_ulhmnwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNCollaboration" target="_ulhA5QkFEeWVleXnap4Kwg" xmi:id="_ulhmoAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNCollaboration" updateName="true" xmi:id="_ulhmoQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNCollaboration" target="_ulhA6AkFEeWVleXnap4Kwg" xmi:id="_ulhmogkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNCollaboration" updateName="true" xmi:id="_ulhmowkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlowAssociation" target="_ulhA6wkFEeWVleXnap4Kwg" xmi:id="_ulhmpAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlowAssociation" updateName="true" xmi:id="_ulhmpQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlowAssociation" target="_ulhA7gkFEeWVleXnap4Kwg" xmi:id="_ulhmpgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlowAssociation" updateName="true" xmi:id="_ulhmpwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerEntity" target="_ulhA8QkFEeWVleXnap4Kwg" xmi:id="_ulhmqAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerEntity" updateName="true" xmi:id="_ulhmqQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerEntity" target="_ulhA9AkFEeWVleXnap4Kwg" xmi:id="_ulhmqgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerEntity" updateName="true" xmi:id="_ulhmqwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerEntity" target="_ulhA9wkFEeWVleXnap4Kwg" xmi:id="_ulhmrAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerEntity" updateName="true" xmi:id="_ulhmrQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantAssociation" target="_ulhA-gkFEeWVleXnap4Kwg" xmi:id="_ulhmrgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantAssociation" updateName="true" xmi:id="_ulhmrwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantAssociation" target="_ulhA_QkFEeWVleXnap4Kwg" xmi:id="_ulhmsAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantAssociation" updateName="true" xmi:id="_ulhmsQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantMultiplicity" target="_ulhBAAkFEeWVleXnap4Kwg" xmi:id="_ulhmsgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantMultiplicity" updateName="true" xmi:id="_ulhmswkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantMultiplicity" target="_ulhBAwkFEeWVleXnap4Kwg" xmi:id="_ulhmtAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantMultiplicity" updateName="true" xmi:id="_ulhmtQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.documentation" target="_ulhBBgkFEeWVleXnap4Kwg" xmi:id="_ulhmtgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Documentation" updateName="true" xmi:id="_ulhmtwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.documentation" target="_ulhBCQkFEeWVleXnap4Kwg" xmi:id="_ulhmuAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Documentation" updateName="true" xmi:id="_ulhmuQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.extensionDefinition" target="_ulhBDAkFEeWVleXnap4Kwg" xmi:id="_ulhmugkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExtensionDefinition" updateName="true" xmi:id="_ulhmuwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNRelationship" target="_ulhBDwkFEeWVleXnap4Kwg" xmi:id="_ulhmvAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNRelationship" updateName="true" xmi:id="_ulhmvQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNRelationship" target="_ulhBEgkFEeWVleXnap4Kwg" xmi:id="_ulhmvgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNRelationship" updateName="true" xmi:id="_ulhmvwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.baseElement" target="_ulhBFQkFEeWVleXnap4Kwg" xmi:id="_ulhmwAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BaseElement" updateName="true" xmi:id="_ulhmwQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.extensionAttributeValue" target="_ulhBGAkFEeWVleXnap4Kwg" xmi:id="_ulhmwgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExtensionAttributeValue" updateName="true" xmi:id="_ulhmwwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.extensionAttributeDefinition" target="_ulhBGwkFEeWVleXnap4Kwg" xmi:id="_ulhmxAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExtensionAttributeDefinition" updateName="true" xmi:id="_ulhmxQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNExtension" target="_ulhBHgkFEeWVleXnap4Kwg" xmi:id="_ulhmxgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNExtension" updateName="true" xmi:id="_ulhmxwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNOperation" target="_ulhBIQkFEeWVleXnap4Kwg" xmi:id="_ulhmyAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNOperation" updateName="true" xmi:id="_ulhmyQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNOperation" target="_ulhBJAkFEeWVleXnap4Kwg" xmi:id="_ulhmygkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNOperation" updateName="true" xmi:id="_ulhmywkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNInterface" target="_ulhBJwkFEeWVleXnap4Kwg" xmi:id="_ulhmzAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNInterface" updateName="true" xmi:id="_ulhmzQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNInterface" target="_ulhBKgkFEeWVleXnap4Kwg" xmi:id="_ulhmzgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNInterface" updateName="true" xmi:id="_ulhmzwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNInterface" target="_ulhBLQkFEeWVleXnap4Kwg" xmi:id="_ulhm0AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNInterface" updateName="true" xmi:id="_ulhm0QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subConversation_UML::InformationFlow" target="_ulhBMAkFEeWVleXnap4Kwg" xmi:id="_ulhm0gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubConversation" updateName="true" xmi:id="_ulhm0wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subConversation" target="_ulhBMwkFEeWVleXnap4Kwg" xmi:id="_ulhm1AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubConversation" updateName="true" xmi:id="_ulhm1QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationNode_UML::InformationFlow" target="_ulhBNgkFEeWVleXnap4Kwg" xmi:id="_ulhm1gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationNode" updateName="true" xmi:id="_ulhm1wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationNode" target="_ulhBOQkFEeWVleXnap4Kwg" xmi:id="_ulhm2AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationNode" updateName="true" xmi:id="_ulhm2QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalConversation" target="_ulhBPAkFEeWVleXnap4Kwg" xmi:id="_ulhm2gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalConversation" updateName="true" xmi:id="_ulhm2wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalConversation" target="_ulhBPwkFEeWVleXnap4Kwg" xmi:id="_ulhm3AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalConversation" updateName="true" xmi:id="_ulhm3QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalConversation" target="_ulhBQgkFEeWVleXnap4Kwg" xmi:id="_ulhm3gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalConversation" updateName="true" xmi:id="_ulhm3wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callConversation_UML::InformationFlow" target="_ulhBRQkFEeWVleXnap4Kwg" xmi:id="_ulhm4AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallConversation" updateName="true" xmi:id="_ulhm4QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callConversation" target="_ulhBSAkFEeWVleXnap4Kwg" xmi:id="_ulhm4gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallConversation" updateName="true" xmi:id="_ulhm4wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversation_UML::InformationFlow" target="_ulhBSwkFEeWVleXnap4Kwg" xmi:id="_ulhm5AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Conversation" updateName="true" xmi:id="_ulhm5QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversation" target="_ulhBTgkFEeWVleXnap4Kwg" xmi:id="_ulhm5gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Conversation" updateName="true" xmi:id="_ulhm5wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationLink" target="_ulhBUQkFEeWVleXnap4Kwg" xmi:id="_ulhm6AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationLink" updateName="true" xmi:id="_ulhm6QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationLink" target="_ulhBVAkFEeWVleXnap4Kwg" xmi:id="_ulhm6gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationLink" updateName="true" xmi:id="_ulhm6wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBVwkFEeWVleXnap4Kwg" xmi:id="_ulhm7AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm7QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBWgkFEeWVleXnap4Kwg" xmi:id="_ulhm7gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm7wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBXQkFEeWVleXnap4Kwg" xmi:id="_ulhm8AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm8QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBYAkFEeWVleXnap4Kwg" xmi:id="_ulhm8gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm8wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.performer" target="_ulhBYwkFEeWVleXnap4Kwg" xmi:id="_ulhm9AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Performer" updateName="true" xmi:id="_ulhm9QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.performer" target="_ulhBZgkFEeWVleXnap4Kwg" xmi:id="_ulhm9gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Performer" updateName="true" xmi:id="_ulhm9wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNActivity" target="_ulhBaQkFEeWVleXnap4Kwg" xmi:id="_ulhm-AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNActivity" updateName="true" xmi:id="_ulhm-QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNActivity" target="_ulhBbAkFEeWVleXnap4Kwg" xmi:id="_ulhm-gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNActivity" updateName="true" xmi:id="_ulhm-wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNActivity" target="_ulhBbwkFEeWVleXnap4Kwg" xmi:id="_ulhm_AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNActivity" updateName="true" xmi:id="_ulhm_QkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.loopCharacteristics" target="_ulhBcgkFEeWVleXnap4Kwg" xmi:id="_ulhm_gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LoopCharacteristics" updateName="true" xmi:id="_ulhm_wkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.loopCharacteristics" target="_ulhBdQkFEeWVleXnap4Kwg" xmi:id="_ulhnAAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LoopCharacteristics" updateName="true" xmi:id="_ulhnAQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBeAkFEeWVleXnap4Kwg" xmi:id="_ulhnAgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnAwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBewkFEeWVleXnap4Kwg" xmi:id="_ulhnBAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnBQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBfgkFEeWVleXnap4Kwg" xmi:id="_ulhnBgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnBwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBgQkFEeWVleXnap4Kwg" xmi:id="_ulhnCAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnCQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceRole" target="_ulhBhAkFEeWVleXnap4Kwg" xmi:id="_ulhnCgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceRole" updateName="true" xmi:id="_ulhnCwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceRole" target="_ulhBhwkFEeWVleXnap4Kwg" xmi:id="_ulhnDAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceRole" updateName="true" xmi:id="_ulhnDQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBigkFEeWVleXnap4Kwg" xmi:id="_ulhnDgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnDwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBjQkFEeWVleXnap4Kwg" xmi:id="_ulhnEAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnEQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBkAkFEeWVleXnap4Kwg" xmi:id="_ulhnEgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnEwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBkwkFEeWVleXnap4Kwg" xmi:id="_ulhnFAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnFQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexBehaviorDefinition" target="_ulhBlgkFEeWVleXnap4Kwg" xmi:id="_ulhnFgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexBehaviorDefinition" updateName="true" xmi:id="_ulhnFwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexBehaviorDefinition" target="_ulhBmQkFEeWVleXnap4Kwg" xmi:id="_ulhnGAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexBehaviorDefinition" updateName="true" xmi:id="_ulhnGQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceAssignmentExpression" target="_ulhBnAkFEeWVleXnap4Kwg" xmi:id="_ulhnGgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceAssignmentExpression" updateName="true" xmi:id="_ulhnGwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceAssignmentExpression" target="_ulhBnwkFEeWVleXnap4Kwg" xmi:id="_ulhnHAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceAssignmentExpression" updateName="true" xmi:id="_ulhnHQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBogkFEeWVleXnap4Kwg" xmi:id="_ulhnHgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnHwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBpQkFEeWVleXnap4Kwg" xmi:id="_ulhnIAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnIQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBqAkFEeWVleXnap4Kwg" xmi:id="_ulhnIgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnIwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBqwkFEeWVleXnap4Kwg" xmi:id="_ulhnJAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnJQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBrgkFEeWVleXnap4Kwg" xmi:id="_ulhnJgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnJwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBsQkFEeWVleXnap4Kwg" xmi:id="_ulhnKAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnKQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBtAkFEeWVleXnap4Kwg" xmi:id="_ulhnKgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnKwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBtwkFEeWVleXnap4Kwg" xmi:id="_ulhnLAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnLQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBugkFEeWVleXnap4Kwg" xmi:id="_ulhnLgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhnLwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBvQkFEeWVleXnap4Kwg" xmi:id="_ulhnMAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhnMQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBwAkFEeWVleXnap4Kwg" xmi:id="_ulhnMgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhnMwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhBwwkFEeWVleXnap4Kwg" xmi:id="_ulhnNAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnNQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhBxgkFEeWVleXnap4Kwg" xmi:id="_ulhnNgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnNwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhByQkFEeWVleXnap4Kwg" xmi:id="_ulhnOAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnOQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhBzAkFEeWVleXnap4Kwg" xmi:id="_ulhnOgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnOwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhBzwkFEeWVleXnap4Kwg" xmi:id="_ulhnPAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnPQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhB0gkFEeWVleXnap4Kwg" xmi:id="_ulhnPgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnPwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhB1QkFEeWVleXnap4Kwg" xmi:id="_ulhnQAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnQQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhB2AkFEeWVleXnap4Kwg" xmi:id="_ulhnQgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnQwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.standardLoopCharacteristics" target="_ulhB2wkFEeWVleXnap4Kwg" xmi:id="_ulhnRAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StandardLoopCharacteristics" updateName="true" xmi:id="_ulhnRQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.standardLoopCharacteristics" target="_ulhB3gkFEeWVleXnap4Kwg" xmi:id="_ulhnRgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StandardLoopCharacteristics" updateName="true" xmi:id="_ulhnRwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.standardLoopCharacteristics" target="_ulhB4QkFEeWVleXnap4Kwg" xmi:id="_ulhnSAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StandardLoopCharacteristics" updateName="true" xmi:id="_ulhnSQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB5AkFEeWVleXnap4Kwg" xmi:id="_ulhnSgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnSwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB5wkFEeWVleXnap4Kwg" xmi:id="_ulhnTAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnTQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB6gkFEeWVleXnap4Kwg" xmi:id="_ulhnTgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnTwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB7QkFEeWVleXnap4Kwg" xmi:id="_ulhnUAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnUQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameterBinding" target="_ulhB8AkFEeWVleXnap4Kwg" xmi:id="_ulhnUgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameterBinding" updateName="true" xmi:id="_ulhnUwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameterBinding" target="_ulhB8wkFEeWVleXnap4Kwg" xmi:id="_ulhnVAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameterBinding" updateName="true" xmi:id="_ulhnVQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB9gkFEeWVleXnap4Kwg" xmi:id="_ulhnVgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnVwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB-QkFEeWVleXnap4Kwg" xmi:id="_ulhnWAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnWQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB_AkFEeWVleXnap4Kwg" xmi:id="_ulhnWgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnWwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB_wkFEeWVleXnap4Kwg" xmi:id="_ulhnXAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnXQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.multiInstanceLoopCharacteristics" target="_ulhCAgkFEeWVleXnap4Kwg" xmi:id="_ulhnXgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MultiInstanceLoopCharacteristics" updateName="true" xmi:id="_ulhnXwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.multiInstanceLoopCharacteristics" target="_ulhCBQkFEeWVleXnap4Kwg" xmi:id="_ulhnYAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MultiInstanceLoopCharacteristics" updateName="true" xmi:id="_ulhnYQkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.multiInstanceLoopCharacteristics" target="_ulhCCAkFEeWVleXnap4Kwg" xmi:id="_ulhnYgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MultiInstanceLoopCharacteristics" updateName="true" xmi:id="_ulhnYwkFEeWVleXnap4Kwg">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_ulgXkAkFEeWVleXnap4Kwg" xmi:version="2.0">

+  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode" name="InclusiveGateway JoinNode" xmi:id="_ulgXkQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgXkgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXkwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode" name="InclusiveGateway ForkNode" xmi:id="_ulgXlAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXlQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXlgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ControlNode" name="InclusiveGateway ControlNode" xmi:id="_ulgXlwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXmAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXmQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityGroup" name="InclusiveGateway ActivityGroup" xmi:id="_ulgXmgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXmwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXnAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_ActivityNode" name="InclusiveGateway ActivityNode" xmi:id="_ulgXnQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXngkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXnwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InclusiveGateway_Element" name="InclusiveGateway Element" xmi:id="_ulgXoAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXoQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXogkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ControlNode" name="Gateway ControlNode" xmi:id="_ulgXowkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXpAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXpQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityGroup" name="Gateway ActivityGroup" xmi:id="_ulgXpgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXpwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXqAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Gateway_ActivityNode" name="Gateway ActivityNode" xmi:id="_ulgXqQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXqgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXqwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Gateway_Element" name="Gateway Element" xmi:id="_ulgXrAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXrQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXrgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Gateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode" name="EventBasedGateway ForkNode" xmi:id="_ulgXrwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXsAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXsQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode" name="EventBasedGateway StructuredActivityNode" xmi:id="_ulgXsgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulgXswkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXtAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InterruptibleActivityRegion" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_ulgXtQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_ulgXtgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterruptibleActivityRegion</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXtwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ControlNode" name="EventBasedGateway ControlNode" xmi:id="_ulgXuAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXuQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXugkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityGroup" name="EventBasedGateway ActivityGroup" xmi:id="_ulgXuwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXvAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXvQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_ActivityNode" name="EventBasedGateway ActivityNode" xmi:id="_ulgXvgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgXvwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXwAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EventBasedGateway_Element" name="EventBasedGateway Element" xmi:id="_ulgXwQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgXwgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXwwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventBasedGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode" name="NonExclusiveGateway JoinNode" xmi:id="_ulgXxAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgXxQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXxgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode" name="NonExclusiveGateway ForkNode" xmi:id="_ulgXxwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgXyAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXyQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ControlNode" name="NonExclusiveGateway ControlNode" xmi:id="_ulgXygkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgXywkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXzAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityGroup" name="NonExclusiveGateway ActivityGroup" xmi:id="_ulgXzQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgXzgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgXzwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_ActivityNode" name="NonExclusiveGateway ActivityNode" xmi:id="_ulgX0AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX0QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX0gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.NonExclusiveGateway_Element" name="NonExclusiveGateway Element" xmi:id="_ulgX0wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX1AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX1QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::NonExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode" name="ParallelGateway JoinNode" xmi:id="_ulgX1gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgX1wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX2AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode" name="ParallelGateway ForkNode" xmi:id="_ulgX2QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgX2gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX2wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ControlNode" name="ParallelGateway ControlNode" xmi:id="_ulgX3AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgX3QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX3gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityGroup" name="ParallelGateway ActivityGroup" xmi:id="_ulgX3wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgX4AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX4QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_ActivityNode" name="ParallelGateway ActivityNode" xmi:id="_ulgX4gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX4wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX5AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParallelGateway_Element" name="ParallelGateway Element" xmi:id="_ulgX5QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX5gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX5wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParallelGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::JoinNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode" name="ComplexGateway JoinNode" xmi:id="_ulgX6AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_ulgX6QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX6gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ForkNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode" name="ComplexGateway ForkNode" xmi:id="_ulgX6wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ulgX7AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX7QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ControlNode" name="ComplexGateway ControlNode" xmi:id="_ulgX7gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgX7wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX8AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityGroup" name="ComplexGateway ActivityGroup" xmi:id="_ulgX8QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgX8gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX8wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_ActivityNode" name="ComplexGateway ActivityNode" xmi:id="_ulgX9AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgX9QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX9gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ComplexGateway_Element" name="ComplexGateway Element" xmi:id="_ulgX9wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgX-AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX-QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DecisionNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode" name="ExclusiveGateway DecisionNode" xmi:id="_ulgX-gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_ulgX-wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX_AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::MergeNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode" name="ExclusiveGateway MergeNode" xmi:id="_ulgX_QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_ulgX_gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgX_wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ControlNode" name="ExclusiveGateway ControlNode" xmi:id="_ulgYAAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_ulgYAQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYAgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityGroup" name="ExclusiveGateway ActivityGroup" xmi:id="_ulgYAwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ulgYBAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityGroup</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYBQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_ActivityNode" name="ExclusiveGateway ActivityNode" xmi:id="_ulgYBgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulgYBwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYCAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ExclusiveGateway_Element" name="ExclusiveGateway Element" xmi:id="_ulgYCQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYCgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYCwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExclusiveGateway</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.RootElement_PackageableElement" name="RootElement PackageableElement" xmi:id="_ulgYDAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYDQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYDgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::RootElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.RootElement_Element" name="RootElement Element" xmi:id="_ulgYDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYEAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYEQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::RootElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageImport" identifier="org.eclipse.papyrus.bpmn.Import_UML::PackageImport" name="Import" xmi:id="_ulgYEgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_ulgYEwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYFAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Import</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Package" identifier="org.eclipse.papyrus.bpmn.Definitions_Package" name="Definitions Package" xmi:id="_ulgYFQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_ulgYFgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYFwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Definitions_Element" name="Definitions Element" xmi:id="_ulgYGAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYGQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYGgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition" name="LaneSet ActivityPartition" xmi:id="_ulgYGwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulgYHAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYHQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LaneSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LaneSet_Element" name="LaneSet Element" xmi:id="_ulgYHgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYHwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYIAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LaneSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Monitoring_Class" name="Monitoring Class" xmi:id="_ulgYIQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulgYIgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYIwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Monitoring</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Monitoring_Element" name="Monitoring Element" xmi:id="_ulgYJAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYJQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYJgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Monitoring</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Activity" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Activity" name="BPMNProcess Activity" xmi:id="_ulgYJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_ulgYKAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYKQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Behavior" name="BPMNProcess Behavior" xmi:id="_ulgYKgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYKwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYLAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_PackageableElement" name="BPMNProcess PackageableElement" xmi:id="_ulgYLQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYLgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYLwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNProcess_Element" name="BPMNProcess Element" xmi:id="_ulgYMAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYMQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYMgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Lane_ActivityPartition" name="Lane ActivityPartition" xmi:id="_ulgYMwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulgYNAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYNQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Lane</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Lane_Element" name="Lane Element" xmi:id="_ulgYNgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYNwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYOAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Lane</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_OpaqueBehavior" name="GlobalScriptTask OpaqueBehavior" xmi:id="_ulgYOQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYOgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYOwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Behavior" name="GlobalScriptTask Behavior" xmi:id="_ulgYPAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYPQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYPgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_PackageableElement" name="GlobalScriptTask PackageableElement" xmi:id="_ulgYPwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYQAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYQQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalScriptTask_Element" name="GlobalScriptTask Element" xmi:id="_ulgYQgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYQwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYRAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Auditing_Class" name="Auditing Class" xmi:id="_ulgYRQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulgYRgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYRwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Auditing</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Auditing_Element" name="Auditing Element" xmi:id="_ulgYSAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYSQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYSgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Auditing</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_OpaqueBehavior" name="GlobalTask OpaqueBehavior" xmi:id="_ulgYSwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYTAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYTQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Behavior" name="GlobalTask Behavior" xmi:id="_ulgYTgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYTwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYUAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalTask_PackageableElement" name="GlobalTask PackageableElement" xmi:id="_ulgYUQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYUgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYUwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalTask_Element" name="GlobalTask Element" xmi:id="_ulgYVAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYVQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYVgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_OpaqueBehavior" name="GlobalBusinessRuleTask OpaqueBehavior" xmi:id="_ulgYVwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulgYWAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYWQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Behavior" name="GlobalBusinessRuleTask Behavior" xmi:id="_ulgYWgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulgYWwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYXAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_PackageableElement" name="GlobalBusinessRuleTask PackageableElement" xmi:id="_ulgYXQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYXgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYXwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalBusinessRuleTask_Element" name="GlobalBusinessRuleTask Element" xmi:id="_ulgYYAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYYQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYYgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalBusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_CallEvent" name="CompensateEventDefinition CallEvent" xmi:id="_ulgYYwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYZAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYZQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Event" name="CompensateEventDefinition Event" xmi:id="_ulgYZgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYZwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYaAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_PackageableElement" name="CompensateEventDefinition PackageableElement" xmi:id="_ulgYaQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYagkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYawkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CompensateEventDefinition_Element" name="CompensateEventDefinition Element" xmi:id="_ulgYbAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYbQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYbgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CompensateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_CallEvent" name="EscalationEventDefinition CallEvent" xmi:id="_ulgYbwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYcAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYcQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Event" name="EscalationEventDefinition Event" xmi:id="_ulgYcgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYcwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYdAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_PackageableElement" name="EscalationEventDefinition PackageableElement" xmi:id="_ulgYdQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYdgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYdwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EscalationEventDefinition_Element" name="EscalationEventDefinition Element" xmi:id="_ulgYeAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYeQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYegkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EscalationEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_ChangeEvent" name="TimerEventDefinition ChangeEvent" xmi:id="_ulgYewkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ulgYfAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYfQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Event" name="TimerEventDefinition Event" xmi:id="_ulgYfgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYfwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYgAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_PackageableElement" name="TimerEventDefinition PackageableElement" xmi:id="_ulgYgQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYggkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYgwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TimerEventDefinition_Element" name="TimerEventDefinition Element" xmi:id="_ulgYhAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYhQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYhgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TimerEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_CallEvent" name="SignalEventDefinition CallEvent" xmi:id="_ulgYhwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulgYiAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYiQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Event" name="SignalEventDefinition Event" xmi:id="_ulgYigkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulgYiwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYjAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_PackageableElement" name="SignalEventDefinition PackageableElement" xmi:id="_ulgYjQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulgYjgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYjwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SignalEventDefinition_Element" name="SignalEventDefinition Element" xmi:id="_ulgYkAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulgYkQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYkgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SignalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::FinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FinalNode" name="EndEvent FinalNode" xmi:id="_ulgYkwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalNode.gif" xmi:id="_ulgYlAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FinalNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulgYlQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction" name="EndEvent CallOperationAction" xmi:id="_ulgYlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg-oAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-oQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode" name="EndEvent FlowFinalNode" xmi:id="_ulg-ogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg-owkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-pAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.EndEvent_ActivityNode" name="EndEvent ActivityNode" xmi:id="_ulg-pQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-pgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-pwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EndEvent_Element" name="EndEvent Element" xmi:id="_ulg-qAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-qQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-qgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EndEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Event" name="EventDefinition Event" xmi:id="_ulg-qwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-rAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-rQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.EventDefinition_PackageableElement" name="EventDefinition PackageableElement" xmi:id="_ulg-rgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-rwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-sAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.EventDefinition_Element" name="EventDefinition Element" xmi:id="_ulg-sQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-sgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-swkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::EventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_ActivityNode" name="BPMNEvent ActivityNode" xmi:id="_ulg-tAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-tQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-tgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNEvent_Element" name="BPMNEvent Element" xmi:id="_ulg-twkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-uAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-uQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Error_Class" name="Error Class" xmi:id="_ulg-ugkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg-uwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-vAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Error_PackageableElement" name="Error PackageableElement" xmi:id="_ulg-vQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-vgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-vwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Error_Element" name="Error Element" xmi:id="_ulg-wAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-wQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-wgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Error</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction" name="CatchEvent AcceptEventAction" xmi:id="_ulg-wwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg-xAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-xQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_InitialNode" name="CatchEvent InitialNode" xmi:id="_ulg-xgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg-xwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-yAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.CatchEvent_ActivityNode" name="CatchEvent ActivityNode" xmi:id="_ulg-yQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-ygkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-ywkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CatchEvent_Element" name="CatchEvent Element" xmi:id="_ulg-zAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-zQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-zgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_CallEvent" name="MessageEventDefinition CallEvent" xmi:id="_ulg-zwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg-0AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-0QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Event" name="MessageEventDefinition Event" xmi:id="_ulg-0gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-0wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-1AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_PackageableElement" name="MessageEventDefinition PackageableElement" xmi:id="_ulg-1QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-1gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-1wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageEventDefinition_Element" name="MessageEventDefinition Element" xmi:id="_ulg-2AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-2QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-2gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction" name="StartEvent AcceptEventAction" xmi:id="_ulg-2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg-3AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-3QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_InitialNode" name="StartEvent InitialNode" xmi:id="_ulg-3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg-3wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-4AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.StartEvent_ActivityNode" name="StartEvent ActivityNode" xmi:id="_ulg-4QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg-4gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-4wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.StartEvent_Element" name="StartEvent Element" xmi:id="_ulg-5AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-5QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-5gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StartEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Class" name="BPMNSignal Class" xmi:id="_ulg-5wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg-6AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-6QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_PackageableElement" name="BPMNSignal PackageableElement" xmi:id="_ulg-6gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-6wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-7AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNSignal_Element" name="BPMNSignal Element" xmi:id="_ulg-7QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg-7gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-7wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNSignal</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_ChangeEvent" name="ConditionalEventDefinition ChangeEvent" xmi:id="_ulg-8AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ulg-8QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-8gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Event" name="ConditionalEventDefinition Event" xmi:id="_ulg-8wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg-9AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-9QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_PackageableElement" name="ConditionalEventDefinition PackageableElement" xmi:id="_ulg-9gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg-9wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg--AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConditionalEventDefinition_Element" name="ConditionalEventDefinition Element" xmi:id="_ulg--QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg--gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg--wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConditionalEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_CallEvent" name="LinkEventDefinition CallEvent" xmi:id="_ulg-_AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg-_QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg-_gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Event" name="LinkEventDefinition Event" xmi:id="_ulg-_wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_AAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_AQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_PackageableElement" name="LinkEventDefinition PackageableElement" xmi:id="_ulg_AgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_AwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_BAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LinkEventDefinition_Element" name="LinkEventDefinition Element" xmi:id="_ulg_BQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_BgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_BwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LinkEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_CallEvent" name="ErrorEventDefinition CallEvent" xmi:id="_ulg_CAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_CQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_CgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Event" name="ErrorEventDefinition Event" xmi:id="_ulg_CwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_DAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_DQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_PackageableElement" name="ErrorEventDefinition PackageableElement" xmi:id="_ulg_DgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_DwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_EAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ErrorEventDefinition_Element" name="ErrorEventDefinition Element" xmi:id="_ulg_EQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_EgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_EwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ErrorEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_ulg_FAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg_FQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_FgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode" name="IntermediateCatchEvent InitialNode" xmi:id="_ulg_FwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg_GAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_GQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_ActivityNode" name="IntermediateCatchEvent ActivityNode" xmi:id="_ulg_GgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_GwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_HAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.IntermediateCatchEvent_Element" name="IntermediateCatchEvent Element" xmi:id="_ulg_HQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_HgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_HwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateCatchEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::SendObjectAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction" name="IntermediateThrowEvent SendObjectAction" xmi:id="_ulg_IAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_ulg_IQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.SendObjectAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_IgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction" name="IntermediateThrowEvent CallOperationAction" xmi:id="_ulg_IwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_JAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_JQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_ulg_JgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_JwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_KAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_ActivityNode" name="IntermediateThrowEvent ActivityNode" xmi:id="_ulg_KQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_KgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_KwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.IntermediateThrowEvent_Element" name="IntermediateThrowEvent Element" xmi:id="_ulg_LAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_LQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_LgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::IntermediateThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_CallEvent" name="TerminateEventDefinition CallEvent" xmi:id="_ulg_LwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_MAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_MQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Event" name="TerminateEventDefinition Event" xmi:id="_ulg_MgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_MwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_NAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_PackageableElement" name="TerminateEventDefinition PackageableElement" xmi:id="_ulg_NQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_NgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_NwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TerminateEventDefinition_Element" name="TerminateEventDefinition Element" xmi:id="_ulg_OAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_OQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_OgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TerminateEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction" name="ThrowEvent CallOperationAction" xmi:id="_ulg_OwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_PAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_PQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode" name="ThrowEvent FlowFinalNode" xmi:id="_ulg_PgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_PwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_QAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_ActivityNode" name="ThrowEvent ActivityNode" xmi:id="_ulg_QQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_QgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_QwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ThrowEvent_Element" name="ThrowEvent Element" xmi:id="_ulg_RAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_RQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_RgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction" name="BoundaryEvent AcceptEventAction" xmi:id="_ulg_RwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulg_SAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_SQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InitialNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode" name="BoundaryEvent InitialNode" xmi:id="_ulg_SgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_ulg_SwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_TAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_ActivityNode" name="BoundaryEvent ActivityNode" xmi:id="_ulg_TQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_TgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_TwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BoundaryEvent_Element" name="BoundaryEvent Element" xmi:id="_ulg_UAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_UQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_UgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BoundaryEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction" name="ImplicitThrowEvent CallOperationAction" xmi:id="_ulg_UwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulg_VAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_VQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_ulg_VgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ulg_VwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_WAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_ActivityNode" name="ImplicitThrowEvent ActivityNode" xmi:id="_ulg_WQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_WgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_WwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ImplicitThrowEvent_Element" name="ImplicitThrowEvent Element" xmi:id="_ulg_XAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_XQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_XgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ImplicitThrowEvent</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallEvent" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_CallEvent" name="CancelEventDefinition CallEvent" xmi:id="_ulg_XwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ulg_YAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_YQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Event" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Event" name="CancelEventDefinition Event" xmi:id="_ulg_YgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_ulg_YwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Event</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_ZAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_PackageableElement" name="CancelEventDefinition PackageableElement" xmi:id="_ulg_ZQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_ZgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_ZwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CancelEventDefinition_Element" name="CancelEventDefinition Element" xmi:id="_ulg_aAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_aQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_agkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CancelEventDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Escalation_Class" name="Escalation Class" xmi:id="_ulg_awkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_bAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_bQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Escalation_PackageableElement" name="Escalation PackageableElement" xmi:id="_ulg_bgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_bwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_cAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Escalation_Element" name="Escalation Element" xmi:id="_ulg_cQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_cgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_cwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Escalation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Comment" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Comment" name="TextAnnotation Comment" xmi:id="_ulg_dAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_ulg_dQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_dgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TextAnnotation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.TextAnnotation_Element" name="TextAnnotation Element" xmi:id="_ulg_dwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_eAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_eQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::TextAnnotation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Enumeration" identifier="org.eclipse.papyrus.bpmn.Category_Enumeration" name="Category Enumeration" xmi:id="_ulg_egkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_ulg_ewkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_fAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Category_PackageableElement" name="Category PackageableElement" xmi:id="_ulg_fQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_fgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_fwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Category_Element" name="Category Element" xmi:id="_ulg_gAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_gQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_ggkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Category</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Dependency" name="BPMNAssociation Dependency" xmi:id="_ulg_gwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulg_hAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_hQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNAssociation_Element" name="BPMNAssociation Element" xmi:id="_ulg_hgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_hwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_iAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.bpmn.Group_ActivityPartition" name="Group ActivityPartition" xmi:id="_ulg_iQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ulg_igkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_iwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Group</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Group_Element" name="Group Element" xmi:id="_ulg_jAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_jQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_jgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Group</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::EnumerationLiteral" identifier="org.eclipse.papyrus.bpmn.CategoryValue_EnumerationLiteral" name="CategoryValue EnumerationLiteral" xmi:id="_ulg_jwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_ulg_kAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_kQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CategoryValue</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CategoryValue_Element" name="CategoryValue Element" xmi:id="_ulg_kgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_kwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_lAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CategoryValue</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNArtifact" name="BPMNArtifact" xmi:id="_ulg_lQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_lgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_lwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNArtifact</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.FlowNode_ActivityNode" name="FlowNode ActivityNode" xmi:id="_ulg_mAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulg_mQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_mgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::FlowNode</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowNode_Element" name="FlowNode Element" xmi:id="_ulg_mwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_nAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_nQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::FlowNode</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.FormalExpression_OpaqueExpression" name="FormalExpression OpaqueExpression" xmi:id="_ulg_ngkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulg_nwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_oAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::FormalExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FormalExpression_Element" name="FormalExpression Element" xmi:id="_ulg_oQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_ogkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_owkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::FormalExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.Resource_Class" name="Resource Class" xmi:id="_ulg_pAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_pQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_pgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.Resource_PackageableElement" name="Resource PackageableElement" xmi:id="_ulg_pwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_qAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_qQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Resource_Element" name="Resource Element" xmi:id="_ulg_qgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_qwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_rAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Resource</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowElement" name="FlowElement" xmi:id="_ulg_rQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_rgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_rwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::FlowElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Property" name="CorrelationPropertyBinding Property" xmi:id="_ulg_sAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_sQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_sgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyBinding</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyBinding_Element" name="CorrelationPropertyBinding Element" xmi:id="_ulg_swkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_tAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_tQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyBinding</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Class" name="CorrelationSubscription Class" xmi:id="_ulg_tgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_twkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_uAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationSubscription</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationSubscription_Element" name="CorrelationSubscription Element" xmi:id="_ulg_uQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_ugkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_uwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationSubscription</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.CallableElement_Behavior" name="CallableElement Behavior" xmi:id="_ulg_vAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulg_vQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_vgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.CallableElement_PackageableElement" name="CallableElement PackageableElement" xmi:id="_ulg_vwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_wAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_wQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallableElement_Element" name="CallableElement Element" xmi:id="_ulg_wgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_wwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_xAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallableElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlFlow" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow" name="SequenceFlow ControlFlow" xmi:id="_ulg_xQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_ulg_xgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_xwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SequenceFlow</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SequenceFlow_Element" name="SequenceFlow Element" xmi:id="_ulg_yAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_yQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_ygkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SequenceFlow</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Dependency" name="CorrelationPropertyRetrievalExpression Dependency" xmi:id="_ulg_ywkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulg_zAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_zQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyRetrievalExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationPropertyRetrievalExpression_Element" name="CorrelationPropertyRetrievalExpression Element" xmi:id="_ulg_zgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_zwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_0AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationPropertyRetrievalExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_OpaqueExpression" name="BPMNExpression OpaqueExpression" xmi:id="_ulg_0QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulg_0gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_0wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNExpression_Element" name="BPMNExpression Element" xmi:id="_ulg_1AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_1QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_1gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.CorrelationProperty_Property" name="CorrelationProperty Property" xmi:id="_ulg_1wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_2AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_2QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationProperty</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationProperty_Element" name="CorrelationProperty Element" xmi:id="_ulg_2gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_2wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_3AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationProperty</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.ItemDefinition_Class" name="ItemDefinition Class" xmi:id="_ulg_3QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_3gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_3wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ItemDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.ItemDefinition_PackageableElement" name="ItemDefinition PackageableElement" xmi:id="_ulg_4AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_4QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_4gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ItemDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ItemDefinition_Element" name="ItemDefinition Element" xmi:id="_ulg_4wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_5AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_5QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ItemDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.CorrelationKey_Class" name="CorrelationKey Class" xmi:id="_ulg_5gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_5wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_6AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationKey</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CorrelationKey_Element" name="CorrelationKey Element" xmi:id="_ulg_6QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_6gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_6wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CorrelationKey</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.FlowElementsContainer" name="FlowElementsContainer" xmi:id="_ulg_7AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_7QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_7gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::FlowElementsContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.BPMNMessage_Class" name="BPMNMessage Class" xmi:id="_ulg_7wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulg_8AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_8QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNMessage</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNMessage_PackageableElement" name="BPMNMessage PackageableElement" xmi:id="_ulg_8gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulg_8wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_9AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNMessage</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNMessage_Element" name="BPMNMessage Element" xmi:id="_ulg_9QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg_9gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_9wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNMessage</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.ResourceParameter_Property" name="ResourceParameter Property" xmi:id="_ulg_-AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulg_-QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg_-gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceParameter</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceParameter_Element" name="ResourceParameter Element" xmi:id="_ulg_-wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulg__AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulg__QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceParameter</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ParameterSet" identifier="org.eclipse.papyrus.bpmn.OutputSet_ParameterSet" name="OutputSet ParameterSet" xmi:id="_ulg__gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterSet.gif" xmi:id="_ulg__wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ParameterSet</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAAAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::OutputSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.OutputSet_Element" name="OutputSet Element" xmi:id="_ulhAAQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAAgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAAwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::OutputSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ParameterSet" identifier="org.eclipse.papyrus.bpmn.InputSet_ParameterSet" name="InputSet ParameterSet" xmi:id="_ulhABAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterSet.gif" xmi:id="_ulhABQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ParameterSet</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhABgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InputSet_Element" name="InputSet Element" xmi:id="_ulhABwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhACAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhACQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::State" identifier="org.eclipse.papyrus.bpmn.DataState_State" name="DataState State" xmi:id="_ulhACgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif" xmi:id="_ulhACwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.State</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhADAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataState</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataState_Element" name="DataState Element" xmi:id="_ulhADQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhADgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhADwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataState</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.DataObjectReference_DataStoreNode" name="DataObjectReference DataStoreNode" xmi:id="_ulhAEAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAEQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAEgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataObjectReference</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataObjectReference_TypedElement" name="DataObjectReference TypedElement" xmi:id="_ulhAEwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAFAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAFQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataObjectReference</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataObjectReference_Element" name="DataObjectReference Element" xmi:id="_ulhAFgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAFwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAGAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataObjectReference</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.bpmn.DataOutputAssociation_ObjectFlow" name="DataOutputAssociation ObjectFlow" xmi:id="_ulhAGQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_ulhAGgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAGwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutputAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataOutputAssociation_Element" name="DataOutputAssociation Element" xmi:id="_ulhAHAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAHQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAHgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutputAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.InputOutputBinding_Dependency" name="InputOutputBinding Dependency" xmi:id="_ulhAHwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhAIAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAIQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputOutputBinding</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InputOutputBinding_Element" name="InputOutputBinding Element" xmi:id="_ulhAIgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAIwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAJAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputOutputBinding</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.Assignment_Dependency" name="Assignment Dependency" xmi:id="_ulhAJQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhAJgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAJwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Assignment</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Assignment_Element" name="Assignment Element" xmi:id="_ulhAKAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAKQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAKgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Assignment</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OutputPin" identifier="org.eclipse.papyrus.bpmn.DataOutput_OutputPin" name="DataOutput OutputPin" xmi:id="_ulhAKwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_ulhALAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhALQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Parameter" identifier="org.eclipse.papyrus.bpmn.DataOutput_Parameter" name="DataOutput Parameter" xmi:id="_ulhALgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_ulhALwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAMAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityParameterNode" identifier="org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode" name="DataOutput ActivityParameterNode" xmi:id="_ulhAMQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_ulhAMgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAMwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataOutput_TypedElement" name="DataOutput TypedElement" xmi:id="_ulhANAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhANQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhANgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataOutput_Element" name="DataOutput Element" xmi:id="_ulhANwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAOAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAOQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataOutput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.BPMNProperty_DataStoreNode" name="BPMNProperty DataStoreNode" xmi:id="_ulhAOgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAOwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAPAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProperty</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.BPMNProperty_TypedElement" name="BPMNProperty TypedElement" xmi:id="_ulhAPQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAPgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAPwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProperty</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNProperty_Element" name="BPMNProperty Element" xmi:id="_ulhAQAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAQQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAQgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNProperty</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.ItemAwareElement_TypedElement" name="ItemAwareElement TypedElement" xmi:id="_ulhAQwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhARAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhARQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ItemAwareElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ItemAwareElement_Element" name="ItemAwareElement Element" xmi:id="_ulhARgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhARwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhASAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ItemAwareElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.InputOutputSpecification_Behavior" name="InputOutputSpecification Behavior" xmi:id="_ulhASQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulhASgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhASwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputOutputSpecification</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.InputOutputSpecification_Action" name="InputOutputSpecification Action" xmi:id="_ulhATAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhATQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhATgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputOutputSpecification</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InputOutputSpecification_Element" name="InputOutputSpecification Element" xmi:id="_ulhATwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAUAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAUQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InputOutputSpecification</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.DataStore_Class" name="DataStore Class" xmi:id="_ulhAUgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulhAUwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAVAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataStore</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.DataStore_PackageableElement" name="DataStore PackageableElement" xmi:id="_ulhAVQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhAVgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAVwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataStore</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataStore_Element" name="DataStore Element" xmi:id="_ulhAWAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAWQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAWgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataStore</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.bpmn.DataInputAssociation_ObjectFlow" name="DataInputAssociation ObjectFlow" xmi:id="_ulhAWwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_ulhAXAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAXQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInputAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataInputAssociation_Element" name="DataInputAssociation Element" xmi:id="_ulhAXgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAXwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAYAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInputAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode" name="DataStoreReference DataStoreNode" xmi:id="_ulhAYQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAYgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAYwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataStoreReference</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataStoreReference_Element" name="DataStoreReference Element" xmi:id="_ulhAZAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAZQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAZgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataStoreReference</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataStoreReference_TypedElement" name="DataStoreReference TypedElement" xmi:id="_ulhAZwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAaAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAaQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataStoreReference</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.bpmn.DataObject_DataStoreNode" name="DataObject DataStoreNode" xmi:id="_ulhAagkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_ulhAawkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAbAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataObject</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataObject_TypedElement" name="DataObject TypedElement" xmi:id="_ulhAbQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAbgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAbwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataObject</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataObject_Element" name="DataObject Element" xmi:id="_ulhAcAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAcQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAcgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataObject</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin" identifier="org.eclipse.papyrus.bpmn.DataInput_InputPin" name="DataInput InputPin" xmi:id="_ulhAcwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_ulhAdAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAdQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Parameter" identifier="org.eclipse.papyrus.bpmn.DataInput_Parameter" name="DataInput Parameter" xmi:id="_ulhAdgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_ulhAdwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAeAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityParameterNode" identifier="org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode" name="DataInput ActivityParameterNode" xmi:id="_ulhAeQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_ulhAegkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAewkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TypedElement" identifier="org.eclipse.papyrus.bpmn.DataInput_TypedElement" name="DataInput TypedElement" xmi:id="_ulhAfAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_ulhAfQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TypedElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAfgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataInput_Element" name="DataInput Element" xmi:id="_ulhAfwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAgAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAgQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataInput</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow" name="DataAssociation ObjectFlow" xmi:id="_ulhAggkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_ulhAgwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAhAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.DataAssociation_Element" name="DataAssociation Element" xmi:id="_ulhAhQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAhgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAhwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::DataAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.UserTask_OpaqueAction" name="UserTask OpaqueAction" xmi:id="_ulhAiAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhAiQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAigkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.UserTask_Action" name="UserTask Action" xmi:id="_ulhAiwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhAjAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAjQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.UserTask_ActivityNode" name="UserTask ActivityNode" xmi:id="_ulhAjgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhAjwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAkAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.UserTask_Element" name="UserTask Element" xmi:id="_ulhAkQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAkgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAkwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::UserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.HumanPerformer_Property" name="HumanPerformer Property" xmi:id="_ulhAlAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhAlQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAlgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::HumanPerformer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.HumanPerformer_Element" name="HumanPerformer Element" xmi:id="_ulhAlwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAmAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAmQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::HumanPerformer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_OpaqueBehavior" name="GlobalUserTask OpaqueBehavior" xmi:id="_ulhAmgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulhAmwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAnAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_Behavior" name="GlobalUserTask Behavior" xmi:id="_ulhAnQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulhAngkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAnwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_PackageableElement" name="GlobalUserTask PackageableElement" xmi:id="_ulhAoAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhAoQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAogkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalUserTask_Element" name="GlobalUserTask Element" xmi:id="_ulhAowkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhApAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhApQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalUserTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Image" identifier="org.eclipse.papyrus.bpmn.Rendering_Image" name="Rendering Image" xmi:id="_ulhApgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Image.gif" xmi:id="_ulhApwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Image</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAqAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Rendering</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Rendering_Element" name="Rendering Element" xmi:id="_ulhAqQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAqgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAqwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Rendering</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_OpaqueBehavior" name="GlobalManualTask OpaqueBehavior" xmi:id="_ulhArAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_ulhArQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhArgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_Behavior" name="GlobalManualTask Behavior" xmi:id="_ulhArwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ulhAsAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAsQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_PackageableElement" name="GlobalManualTask PackageableElement" xmi:id="_ulhAsgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhAswkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAtAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalManualTask_Element" name="GlobalManualTask Element" xmi:id="_ulhAtQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAtgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAtwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction" name="ManualTask OpaqueAction" xmi:id="_ulhAuAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhAuQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAugkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ManualTask_Action" name="ManualTask Action" xmi:id="_ulhAuwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhAvAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAvQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ManualTask_ActivityNode" name="ManualTask ActivityNode" xmi:id="_ulhAvgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhAvwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAwAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ManualTask_Element" name="ManualTask Element" xmi:id="_ulhAwQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAwgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAwwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ManualTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.PotentialOwner_Property" name="PotentialOwner Property" xmi:id="_ulhAxAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhAxQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAxgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PotentialOwner</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.PotentialOwner_Element" name="PotentialOwner Element" xmi:id="_ulhAxwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAyAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAyQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PotentialOwner</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.InteractionNode" name="InteractionNode" xmi:id="_ulhAygkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhAywkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAzAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::InteractionNode</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.Participant_Property" name="Participant Property" xmi:id="_ulhAzQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhAzgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhAzwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Participant</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Participant_Element" name="Participant Element" xmi:id="_ulhA0AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA0QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA0gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Participant</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Class" identifier="org.eclipse.papyrus.bpmn.PartnerRole_Class" name="PartnerRole Class" xmi:id="_ulhA0wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ulhA1AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA1QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PartnerRole</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.PartnerRole_PackageableElement" name="PartnerRole PackageableElement" xmi:id="_ulhA1gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhA1wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA2AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PartnerRole</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.PartnerRole_Element" name="PartnerRole Element" xmi:id="_ulhA2QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA2gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA2wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PartnerRole</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.MessageFlow_InformationFlow_UML::InformationFlow" name="MessageFlow InformationFlow" xmi:id="_ulhA3AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhA3QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA3gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageFlow</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageFlow_Element" name="MessageFlow Element" xmi:id="_ulhA3wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA4AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA4QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageFlow</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Collaboration" identifier="org.eclipse.papyrus.bpmn.BPMNCollaboration_Collaboration" name="BPMNCollaboration Collaboration" xmi:id="_ulhA4gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_ulhA4wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA5AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNCollaboration</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNCollaboration_PackageableElement" name="BPMNCollaboration PackageableElement" xmi:id="_ulhA5QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhA5gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA5wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNCollaboration</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNCollaboration_Element" name="BPMNCollaboration Element" xmi:id="_ulhA6AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA6QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA6gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNCollaboration</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.MessageFlowAssociation_Dependency" name="MessageFlowAssociation Dependency" xmi:id="_ulhA6wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhA7AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA7QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageFlowAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MessageFlowAssociation_Element" name="MessageFlowAssociation Element" xmi:id="_ulhA7gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA7wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA8AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MessageFlowAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InstanceSpecification" identifier="org.eclipse.papyrus.bpmn.PartnerEntity_InstanceSpecification" name="PartnerEntity InstanceSpecification" xmi:id="_ulhA8QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_ulhA8gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA8wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PartnerEntity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.PartnerEntity_PackageableElement" name="PartnerEntity PackageableElement" xmi:id="_ulhA9AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhA9QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA9gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PartnerEntity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.PartnerEntity_Element" name="PartnerEntity Element" xmi:id="_ulhA9wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA-AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA-QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::PartnerEntity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.ParticipantAssociation_Dependency" name="ParticipantAssociation Dependency" xmi:id="_ulhA-gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhA-wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA_AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParticipantAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParticipantAssociation_Element" name="ParticipantAssociation Element" xmi:id="_ulhA_QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhA_gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhA_wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParticipantAssociation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::MultiplicityElement" identifier="org.eclipse.papyrus.bpmn.ParticipantMultiplicity_MultiplicityElement" name="ParticipantMultiplicity MultiplicityElement" xmi:id="_ulhBAAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MultiplicityElement.gif" xmi:id="_ulhBAQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.MultiplicityElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBAgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParticipantMultiplicity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ParticipantMultiplicity_Element" name="ParticipantMultiplicity Element" xmi:id="_ulhBAwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBBAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBBQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ParticipantMultiplicity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Comment" identifier="org.eclipse.papyrus.bpmn.Documentation_Comment" name="Documentation Comment" xmi:id="_ulhBBgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_ulhBBwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBCAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Documentation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Documentation_Element" name="Documentation Element" xmi:id="_ulhBCQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBCgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBCwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Documentation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Stereotype" identifier="org.eclipse.papyrus.bpmn.ExtensionDefinition" name="ExtensionDefinition" xmi:id="_ulhBDAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_ulhBDQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBDgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExtensionDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Constraint" identifier="org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint" name="BPMNRelationship Constraint" xmi:id="_ulhBDwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_ulhBEAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBEQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNRelationship</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNRelationship_Element" name="BPMNRelationship Element" xmi:id="_ulhBEgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBEwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBFAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNRelationship</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BaseElement" name="BaseElement" xmi:id="_ulhBFQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBFgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBFwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BaseElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Slot" identifier="org.eclipse.papyrus.bpmn.ExtensionAttributeValue" name="ExtensionAttributeValue" xmi:id="_ulhBGAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_ulhBGQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBGgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExtensionAttributeValue</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.ExtensionAttributeDefinition" name="ExtensionAttributeDefinition" xmi:id="_ulhBGwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhBHAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBHQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ExtensionAttributeDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Stereotype" identifier="org.eclipse.papyrus.bpmn.BPMNExtension" name="BPMNExtension" xmi:id="_ulhBHgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_ulhBHwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBIAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNExtension</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Operation" identifier="org.eclipse.papyrus.bpmn.BPMNOperation_Operation" name="BPMNOperation Operation" xmi:id="_ulhBIQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_ulhBIgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBIwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNOperation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNOperation_Element" name="BPMNOperation Element" xmi:id="_ulhBJAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBJQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBJgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNOperation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Interface" identifier="org.eclipse.papyrus.bpmn.BPMNInterface_Interface" name="BPMNInterface Interface" xmi:id="_ulhBJwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_ulhBKAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBKQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNInterface</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.BPMNInterface_PackageableElement" name="BPMNInterface PackageableElement" xmi:id="_ulhBKgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhBKwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBLAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNInterface</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNInterface_Element" name="BPMNInterface Element" xmi:id="_ulhBLQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBLgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBLwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNInterface</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.SubConversation_InformationFlow_UML::InformationFlow" name="SubConversation InformationFlow" xmi:id="_ulhBMAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBMQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBMgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SubConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SubConversation_Element" name="SubConversation Element" xmi:id="_ulhBMwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBNAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBNQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SubConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.ConversationNode_InformationFlow_UML::InformationFlow" name="ConversationNode InformationFlow" xmi:id="_ulhBNgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBNwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBOAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConversationNode</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConversationNode_Element" name="ConversationNode Element" xmi:id="_ulhBOQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBOgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBOwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConversationNode</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Collaboration" identifier="org.eclipse.papyrus.bpmn.GlobalConversation_Collaboration" name="GlobalConversation Collaboration" xmi:id="_ulhBPAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_ulhBPQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBPgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageableElement" identifier="org.eclipse.papyrus.bpmn.GlobalConversation_PackageableElement" name="GlobalConversation PackageableElement" xmi:id="_ulhBPwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_ulhBQAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBQQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.GlobalConversation_Element" name="GlobalConversation Element" xmi:id="_ulhBQgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBQwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBRAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::GlobalConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.CallConversation_InformationFlow_UML::InformationFlow" name="CallConversation InformationFlow" xmi:id="_ulhBRQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBRgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBRwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallConversation_Element" name="CallConversation Element" xmi:id="_ulhBSAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBSQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBSgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallConversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.bpmn.Conversation_InformationFlow_UML::InformationFlow" name="Conversation InformationFlow" xmi:id="_ulhBSwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ulhBTAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBTQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Conversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Conversation_Element" name="Conversation Element" xmi:id="_ulhBTgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBTwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBUAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Conversation</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Dependency" identifier="org.eclipse.papyrus.bpmn.ConversationLink_Dependency" name="ConversationLink Dependency" xmi:id="_ulhBUQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_ulhBUgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBUwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConversationLink</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ConversationLink_Element" name="ConversationLink Element" xmi:id="_ulhBVAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBVQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBVgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ConversationLink</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode" name="SubProcess StructuredActivityNode" xmi:id="_ulhBVwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhBWAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBWQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.SubProcess_Action" name="SubProcess Action" xmi:id="_ulhBWgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBWwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBXAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.SubProcess_ActivityNode" name="SubProcess ActivityNode" xmi:id="_ulhBXQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBXgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBXwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SubProcess_Element" name="SubProcess Element" xmi:id="_ulhBYAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBYQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBYgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.Performer_Property" name="Performer Property" xmi:id="_ulhBYwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhBZAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBZQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Performer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Performer_Element" name="Performer Element" xmi:id="_ulhBZgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBZwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBaAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Performer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.BPMNActivity_Action" name="BPMNActivity Action" xmi:id="_ulhBaQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBagkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBawkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BPMNActivity_ActivityNode" name="BPMNActivity ActivityNode" xmi:id="_ulhBbAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBbQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBbgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BPMNActivity_Element" name="BPMNActivity Element" xmi:id="_ulhBbwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBcAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBcQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BPMNActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.LoopCharacteristics_StructuredActivityNode" name="LoopCharacteristics StructuredActivityNode" xmi:id="_ulhBcgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhBcwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBdAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.LoopCharacteristics_Element" name="LoopCharacteristics Element" xmi:id="_ulhBdQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBdgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBdwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::LoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallBehaviorAction" identifier="org.eclipse.papyrus.bpmn.CallActivity_CallBehaviorAction" name="CallActivity CallBehaviorAction" xmi:id="_ulhBeAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_ulhBeQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallBehaviorAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBegkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.CallActivity_Action" name="CallActivity Action" xmi:id="_ulhBewkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBfAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBfQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.CallActivity_ActivityNode" name="CallActivity ActivityNode" xmi:id="_ulhBfgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBfwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBgAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.CallActivity_Element" name="CallActivity Element" xmi:id="_ulhBgQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBggkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBgwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Property" identifier="org.eclipse.papyrus.bpmn.ResourceRole_Property" name="ResourceRole Property" xmi:id="_ulhBhAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ulhBhQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBhgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceRole</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceRole_Element" name="ResourceRole Element" xmi:id="_ulhBhwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBiAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBiQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceRole</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction" name="BusinessRuleTask OpaqueAction" xmi:id="_ulhBigkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhBiwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBjAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_Action" name="BusinessRuleTask Action" xmi:id="_ulhBjQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBjgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBjwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_ActivityNode" name="BusinessRuleTask ActivityNode" xmi:id="_ulhBkAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBkQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBkgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.BusinessRuleTask_Element" name="BusinessRuleTask Element" xmi:id="_ulhBkwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBlAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBlQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::BusinessRuleTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ControlFlow" identifier="org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_ControlFlow" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_ulhBlgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_ulhBlwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBmAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexBehaviorDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_Element" name="ComplexBehaviorDefinition Element" xmi:id="_ulhBmQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBmgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBmwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ComplexBehaviorDefinition</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.bpmn.ResourceAssignmentExpression_OpaqueExpression" name="ResourceAssignmentExpression OpaqueExpression" xmi:id="_ulhBnAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_ulhBnQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBngkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceAssignmentExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceAssignmentExpression_Element" name="ResourceAssignmentExpression Element" xmi:id="_ulhBnwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBoAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBoQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceAssignmentExpression</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_StructuredActivityNode" name="AdHocSubProcess StructuredActivityNode" xmi:id="_ulhBogkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhBowkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBpAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_Action" name="AdHocSubProcess Action" xmi:id="_ulhBpQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBpgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBpwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_ActivityNode" name="AdHocSubProcess ActivityNode" xmi:id="_ulhBqAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBqQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBqgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.AdHocSubProcess_Element" name="AdHocSubProcess Element" xmi:id="_ulhBqwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBrAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBrQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::AdHocSubProcess</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction" name="ScriptTask OpaqueAction" xmi:id="_ulhBrgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_ulhBrwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBsAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ScriptTask_Action" name="ScriptTask Action" xmi:id="_ulhBsQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBsgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBswkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ScriptTask_ActivityNode" name="ScriptTask ActivityNode" xmi:id="_ulhBtAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBtQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBtgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ScriptTask_Element" name="ScriptTask Element" xmi:id="_ulhBtwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBuAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBuQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ScriptTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.Task_Action" name="Task Action" xmi:id="_ulhBugkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBuwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBvAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Task_ActivityNode" name="Task ActivityNode" xmi:id="_ulhBvQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBvgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBvwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Task_Element" name="Task Element" xmi:id="_ulhBwAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBwQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBwgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.SendTask_CallOperationAction" name="SendTask CallOperationAction" xmi:id="_ulhBwwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulhBxAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBxQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.SendTask_Action" name="SendTask Action" xmi:id="_ulhBxgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBxwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhByAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.SendTask_ActivityNode" name="SendTask ActivityNode" xmi:id="_ulhByQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhBygkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBywkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.SendTask_Element" name="SendTask Element" xmi:id="_ulhBzAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhBzQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBzgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::SendTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.Transaction_StructuredActivityNode" name="Transaction StructuredActivityNode" xmi:id="_ulhBzwkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhB0AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB0QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.Transaction_Action" name="Transaction Action" xmi:id="_ulhB0gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhB0wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB1AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.Transaction_ActivityNode" name="Transaction ActivityNode" xmi:id="_ulhB1QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhB1gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB1wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.Transaction_Element" name="Transaction Element" xmi:id="_ulhB2AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB2QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB2gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Transaction</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::LoopNode" identifier="org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_LoopNode" name="StandardLoopCharacteristics LoopNode" xmi:id="_ulhB2wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_ulhB3AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LoopNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB3QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StandardLoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_StructuredActivityNode" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_ulhB3gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhB3wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB4AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StandardLoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_Element" name="StandardLoopCharacteristics Element" xmi:id="_ulhB4QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB4gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB4wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::StandardLoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_AcceptEventAction" name="ReceiveTask AcceptEventAction" xmi:id="_ulhB5AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ulhB5QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB5gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_Action" name="ReceiveTask Action" xmi:id="_ulhB5wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhB6AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB6QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_ActivityNode" name="ReceiveTask ActivityNode" xmi:id="_ulhB6gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhB6wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB7AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ReceiveTask_Element" name="ReceiveTask Element" xmi:id="_ulhB7QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB7gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB7wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ReceiveTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Slot" identifier="org.eclipse.papyrus.bpmn.ResourceParameterBinding_Slot" name="ResourceParameterBinding Slot" xmi:id="_ulhB8AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_ulhB8QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB8gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceParameterBinding</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ResourceParameterBinding_Element" name="ResourceParameterBinding Element" xmi:id="_ulhB8wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhB9AkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB9QkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ResourceParameterBinding</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction" name="ServiceTask CallOperationAction" xmi:id="_ulhB9gkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ulhB9wkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB-AkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.ServiceTask_Action" name="ServiceTask Action" xmi:id="_ulhB-QkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhB-gkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Action</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB-wkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActivityNode" identifier="org.eclipse.papyrus.bpmn.ServiceTask_ActivityNode" name="ServiceTask ActivityNode" xmi:id="_ulhB_AkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ulhB_QkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhB_gkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.ServiceTask_Element" name="ServiceTask Element" xmi:id="_ulhB_wkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhCAAkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhCAQkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::ServiceTask</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ExpansionRegion" identifier="org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_ExpansionRegion" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_ulhCAgkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_ulhCAwkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionRegion</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhCBAkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MultiInstanceLoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_StructuredActivityNode" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_ulhCBQkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_ulhCBgkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhCBwkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MultiInstanceLoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Element" identifier="org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_Element" name="MultiInstanceLoopCharacteristics Element" xmi:id="_ulhCCAkFEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ulhCCQkFEeWVleXnap4Kwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Element</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhCCgkFEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::MultiInstanceLoopCharacteristics</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXkQkFEeWVleXnap4Kwg" xmi:id="_ulhCCwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCDAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXlAkFEeWVleXnap4Kwg" xmi:id="_ulhCDQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCDgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXlwkFEeWVleXnap4Kwg" xmi:id="_ulhCDwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCEAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXmgkFEeWVleXnap4Kwg" xmi:id="_ulhCEQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCEgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXnQkFEeWVleXnap4Kwg" xmi:id="_ulhCEwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCFAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inclusiveGateway" target="_ulgXoAkFEeWVleXnap4Kwg" xmi:id="_ulhCFQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InclusiveGateway" updateName="true" xmi:id="_ulhCFgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXowkFEeWVleXnap4Kwg" xmi:id="_ulhCFwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCGAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXpgkFEeWVleXnap4Kwg" xmi:id="_ulhCGQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCGgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXqQkFEeWVleXnap4Kwg" xmi:id="_ulhCGwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCHAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.gateway" target="_ulgXrAkFEeWVleXnap4Kwg" xmi:id="_ulhCHQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Gateway" updateName="true" xmi:id="_ulhCHgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXrwkFEeWVleXnap4Kwg" xmi:id="_ulhCHwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCIAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXsgkFEeWVleXnap4Kwg" xmi:id="_ulhCIQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCIgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXtQkFEeWVleXnap4Kwg" xmi:id="_ulhCIwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCJAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXuAkFEeWVleXnap4Kwg" xmi:id="_ulhCJQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCJgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXuwkFEeWVleXnap4Kwg" xmi:id="_ulhCJwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCKAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXvgkFEeWVleXnap4Kwg" xmi:id="_ulhCKQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCKgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventBasedGateway" target="_ulgXwQkFEeWVleXnap4Kwg" xmi:id="_ulhCKwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventBasedGateway" updateName="true" xmi:id="_ulhCLAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXxAkFEeWVleXnap4Kwg" xmi:id="_ulhCLQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCLgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXxwkFEeWVleXnap4Kwg" xmi:id="_ulhCLwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCMAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXygkFEeWVleXnap4Kwg" xmi:id="_ulhCMQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCMgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgXzQkFEeWVleXnap4Kwg" xmi:id="_ulhCMwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCNAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgX0AkFEeWVleXnap4Kwg" xmi:id="_ulhCNQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCNgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.nonExclusiveGateway" target="_ulgX0wkFEeWVleXnap4Kwg" xmi:id="_ulhCNwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::NonExclusiveGateway" updateName="true" xmi:id="_ulhCOAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX1gkFEeWVleXnap4Kwg" xmi:id="_ulhCOQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCOgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX2QkFEeWVleXnap4Kwg" xmi:id="_ulhCOwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCPAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX3AkFEeWVleXnap4Kwg" xmi:id="_ulhCPQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCPgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX3wkFEeWVleXnap4Kwg" xmi:id="_ulhCPwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCQAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX4gkFEeWVleXnap4Kwg" xmi:id="_ulhCQQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCQgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.parallelGateway" target="_ulgX5QkFEeWVleXnap4Kwg" xmi:id="_ulhCQwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParallelGateway" updateName="true" xmi:id="_ulhCRAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX6AkFEeWVleXnap4Kwg" xmi:id="_ulhCRQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCRgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX6wkFEeWVleXnap4Kwg" xmi:id="_ulhCRwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCSAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX7gkFEeWVleXnap4Kwg" xmi:id="_ulhCSQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCSgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX8QkFEeWVleXnap4Kwg" xmi:id="_ulhCSwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCTAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX9AkFEeWVleXnap4Kwg" xmi:id="_ulhCTQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCTgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexGateway" target="_ulgX9wkFEeWVleXnap4Kwg" xmi:id="_ulhCTwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexGateway" updateName="true" xmi:id="_ulhCUAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgX-gkFEeWVleXnap4Kwg" xmi:id="_ulhCUQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCUgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgX_QkFEeWVleXnap4Kwg" xmi:id="_ulhCUwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCVAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYAAkFEeWVleXnap4Kwg" xmi:id="_ulhCVQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCVgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYAwkFEeWVleXnap4Kwg" xmi:id="_ulhCVwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCWAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYBgkFEeWVleXnap4Kwg" xmi:id="_ulhCWQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCWgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.exclusiveGateway" target="_ulgYCQkFEeWVleXnap4Kwg" xmi:id="_ulhCWwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExclusiveGateway" updateName="true" xmi:id="_ulhCXAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rootElement" target="_ulgYDAkFEeWVleXnap4Kwg" xmi:id="_ulhCXQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::RootElement" updateName="true" xmi:id="_ulhCXgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rootElement" target="_ulgYDwkFEeWVleXnap4Kwg" xmi:id="_ulhCXwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::RootElement" updateName="true" xmi:id="_ulhCYAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.import_UML::PackageImport" target="_ulgYEgkFEeWVleXnap4Kwg" xmi:id="_ulhCYQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Import" updateName="true" xmi:id="_ulhCYgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.definitions" target="_ulgYFQkFEeWVleXnap4Kwg" xmi:id="_ulhCYwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_ulhCZAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.definitions" target="_ulgYGAkFEeWVleXnap4Kwg" xmi:id="_ulhCZQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_ulhCZgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.laneSet" target="_ulgYGwkFEeWVleXnap4Kwg" xmi:id="_ulhCZwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LaneSet" updateName="true" xmi:id="_ulhCaAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.laneSet" target="_ulgYHgkFEeWVleXnap4Kwg" xmi:id="_ulhCaQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LaneSet" updateName="true" xmi:id="_ulhCagkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.monitoring" target="_ulgYIQkFEeWVleXnap4Kwg" xmi:id="_ulhCawkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Monitoring" updateName="true" xmi:id="_ulhCbAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.monitoring" target="_ulgYJAkFEeWVleXnap4Kwg" xmi:id="_ulhCbQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Monitoring" updateName="true" xmi:id="_ulhCbgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYJwkFEeWVleXnap4Kwg" xmi:id="_ulhCbwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCcAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYKgkFEeWVleXnap4Kwg" xmi:id="_ulhCcQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCcgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYLQkFEeWVleXnap4Kwg" xmi:id="_ulhCcwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCdAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProcess" target="_ulgYMAkFEeWVleXnap4Kwg" xmi:id="_ulhCdQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProcess" updateName="true" xmi:id="_ulhCdgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.lane" target="_ulgYMwkFEeWVleXnap4Kwg" xmi:id="_ulhCdwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Lane" updateName="true" xmi:id="_ulhCeAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.lane" target="_ulgYNgkFEeWVleXnap4Kwg" xmi:id="_ulhCeQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Lane" updateName="true" xmi:id="_ulhCegkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYOQkFEeWVleXnap4Kwg" xmi:id="_ulhCewkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCfAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYPAkFEeWVleXnap4Kwg" xmi:id="_ulhCfQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCfgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYPwkFEeWVleXnap4Kwg" xmi:id="_ulhCfwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCgAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalScriptTask" target="_ulgYQgkFEeWVleXnap4Kwg" xmi:id="_ulhCgQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalScriptTask" updateName="true" xmi:id="_ulhCggkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.auditing" target="_ulgYRQkFEeWVleXnap4Kwg" xmi:id="_ulhCgwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Auditing" updateName="true" xmi:id="_ulhChAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.auditing" target="_ulgYSAkFEeWVleXnap4Kwg" xmi:id="_ulhChQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Auditing" updateName="true" xmi:id="_ulhChgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYSwkFEeWVleXnap4Kwg" xmi:id="_ulhChwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCiAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYTgkFEeWVleXnap4Kwg" xmi:id="_ulhCiQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCigkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYUQkFEeWVleXnap4Kwg" xmi:id="_ulhCiwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCjAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalTask" target="_ulgYVAkFEeWVleXnap4Kwg" xmi:id="_ulhCjQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalTask" updateName="true" xmi:id="_ulhCjgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYVwkFEeWVleXnap4Kwg" xmi:id="_ulhCjwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhCkAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYWgkFEeWVleXnap4Kwg" xmi:id="_ulhCkQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhCkgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYXQkFEeWVleXnap4Kwg" xmi:id="_ulhCkwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhClAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalBusinessRuleTask" target="_ulgYYAkFEeWVleXnap4Kwg" xmi:id="_ulhClQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalBusinessRuleTask" updateName="true" xmi:id="_ulhClgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYYwkFEeWVleXnap4Kwg" xmi:id="_ulhClwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCmAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYZgkFEeWVleXnap4Kwg" xmi:id="_ulhCmQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCmgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYaQkFEeWVleXnap4Kwg" xmi:id="_ulhCmwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCnAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.compensateEventDefinition" target="_ulgYbAkFEeWVleXnap4Kwg" xmi:id="_ulhCnQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CompensateEventDefinition" updateName="true" xmi:id="_ulhCngkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYbwkFEeWVleXnap4Kwg" xmi:id="_ulhCnwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCoAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYcgkFEeWVleXnap4Kwg" xmi:id="_ulhCoQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCogkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYdQkFEeWVleXnap4Kwg" xmi:id="_ulhCowkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCpAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalationEventDefinition" target="_ulgYeAkFEeWVleXnap4Kwg" xmi:id="_ulhCpQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EscalationEventDefinition" updateName="true" xmi:id="_ulhCpgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYewkFEeWVleXnap4Kwg" xmi:id="_ulhCpwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCqAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYfgkFEeWVleXnap4Kwg" xmi:id="_ulhCqQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCqgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYgQkFEeWVleXnap4Kwg" xmi:id="_ulhCqwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCrAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.timerEventDefinition" target="_ulgYhAkFEeWVleXnap4Kwg" xmi:id="_ulhCrQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TimerEventDefinition" updateName="true" xmi:id="_ulhCrgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYhwkFEeWVleXnap4Kwg" xmi:id="_ulhCrwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCsAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYigkFEeWVleXnap4Kwg" xmi:id="_ulhCsQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCsgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYjQkFEeWVleXnap4Kwg" xmi:id="_ulhCswkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCtAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.signalEventDefinition" target="_ulgYkAkFEeWVleXnap4Kwg" xmi:id="_ulhCtQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SignalEventDefinition" updateName="true" xmi:id="_ulhCtgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulgYkwkFEeWVleXnap4Kwg" xmi:id="_ulhCtwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCuAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulgYlgkFEeWVleXnap4Kwg" xmi:id="_ulhCuQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCugkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulg-ogkFEeWVleXnap4Kwg" xmi:id="_ulhCuwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCvAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulg-pQkFEeWVleXnap4Kwg" xmi:id="_ulhCvQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCvgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.endEvent" target="_ulg-qAkFEeWVleXnap4Kwg" xmi:id="_ulhCvwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EndEvent" updateName="true" xmi:id="_ulhCwAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventDefinition" target="_ulg-qwkFEeWVleXnap4Kwg" xmi:id="_ulhCwQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventDefinition" updateName="true" xmi:id="_ulhCwgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventDefinition" target="_ulg-rgkFEeWVleXnap4Kwg" xmi:id="_ulhCwwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventDefinition" updateName="true" xmi:id="_ulhCxAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.eventDefinition" target="_ulg-sQkFEeWVleXnap4Kwg" xmi:id="_ulhCxQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::EventDefinition" updateName="true" xmi:id="_ulhCxgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNEvent" target="_ulg-tAkFEeWVleXnap4Kwg" xmi:id="_ulhCxwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNEvent" updateName="true" xmi:id="_ulhCyAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNEvent" target="_ulg-twkFEeWVleXnap4Kwg" xmi:id="_ulhCyQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNEvent" updateName="true" xmi:id="_ulhCygkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.error" target="_ulg-ugkFEeWVleXnap4Kwg" xmi:id="_ulhCywkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Error" updateName="true" xmi:id="_ulhCzAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.error" target="_ulg-vQkFEeWVleXnap4Kwg" xmi:id="_ulhCzQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Error" updateName="true" xmi:id="_ulhCzgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.error" target="_ulg-wAkFEeWVleXnap4Kwg" xmi:id="_ulhCzwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Error" updateName="true" xmi:id="_ulhC0AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-wwkFEeWVleXnap4Kwg" xmi:id="_ulhC0QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC0gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-xgkFEeWVleXnap4Kwg" xmi:id="_ulhC0wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC1AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-yQkFEeWVleXnap4Kwg" xmi:id="_ulhC1QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC1gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.catchEvent" target="_ulg-zAkFEeWVleXnap4Kwg" xmi:id="_ulhC1wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CatchEvent" updateName="true" xmi:id="_ulhC2AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-zwkFEeWVleXnap4Kwg" xmi:id="_ulhC2QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC2gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-0gkFEeWVleXnap4Kwg" xmi:id="_ulhC2wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC3AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-1QkFEeWVleXnap4Kwg" xmi:id="_ulhC3QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC3gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageEventDefinition" target="_ulg-2AkFEeWVleXnap4Kwg" xmi:id="_ulhC3wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageEventDefinition" updateName="true" xmi:id="_ulhC4AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-2wkFEeWVleXnap4Kwg" xmi:id="_ulhC4QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC4gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-3gkFEeWVleXnap4Kwg" xmi:id="_ulhC4wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC5AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-4QkFEeWVleXnap4Kwg" xmi:id="_ulhC5QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC5gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.startEvent" target="_ulg-5AkFEeWVleXnap4Kwg" xmi:id="_ulhC5wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StartEvent" updateName="true" xmi:id="_ulhC6AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNSignal" target="_ulg-5wkFEeWVleXnap4Kwg" xmi:id="_ulhC6QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNSignal" updateName="true" xmi:id="_ulhC6gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNSignal" target="_ulg-6gkFEeWVleXnap4Kwg" xmi:id="_ulhC6wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNSignal" updateName="true" xmi:id="_ulhC7AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNSignal" target="_ulg-7QkFEeWVleXnap4Kwg" xmi:id="_ulhC7QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNSignal" updateName="true" xmi:id="_ulhC7gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg-8AkFEeWVleXnap4Kwg" xmi:id="_ulhC7wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC8AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg-8wkFEeWVleXnap4Kwg" xmi:id="_ulhC8QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC8gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg-9gkFEeWVleXnap4Kwg" xmi:id="_ulhC8wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC9AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conditionalEventDefinition" target="_ulg--QkFEeWVleXnap4Kwg" xmi:id="_ulhC9QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConditionalEventDefinition" updateName="true" xmi:id="_ulhC9gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg-_AkFEeWVleXnap4Kwg" xmi:id="_ulhC9wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC-AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg-_wkFEeWVleXnap4Kwg" xmi:id="_ulhC-QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC-gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg_AgkFEeWVleXnap4Kwg" xmi:id="_ulhC-wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC_AkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.linkEventDefinition" target="_ulg_BQkFEeWVleXnap4Kwg" xmi:id="_ulhC_QkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LinkEventDefinition" updateName="true" xmi:id="_ulhC_gkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_CAkFEeWVleXnap4Kwg" xmi:id="_ulhC_wkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDAAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_CwkFEeWVleXnap4Kwg" xmi:id="_ulhDAQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDAgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_DgkFEeWVleXnap4Kwg" xmi:id="_ulhDAwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDBAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.errorEventDefinition" target="_ulg_EQkFEeWVleXnap4Kwg" xmi:id="_ulhDBQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ErrorEventDefinition" updateName="true" xmi:id="_ulhDBgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_FAkFEeWVleXnap4Kwg" xmi:id="_ulhDBwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDCAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_FwkFEeWVleXnap4Kwg" xmi:id="_ulhDCQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDCgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_GgkFEeWVleXnap4Kwg" xmi:id="_ulhDCwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDDAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateCatchEvent" target="_ulg_HQkFEeWVleXnap4Kwg" xmi:id="_ulhDDQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateCatchEvent" updateName="true" xmi:id="_ulhDDgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_IAkFEeWVleXnap4Kwg" xmi:id="_ulhDDwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDEAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_IwkFEeWVleXnap4Kwg" xmi:id="_ulhDEQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDEgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_JgkFEeWVleXnap4Kwg" xmi:id="_ulhDEwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDFAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_KQkFEeWVleXnap4Kwg" xmi:id="_ulhDFQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDFgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.intermediateThrowEvent" target="_ulg_LAkFEeWVleXnap4Kwg" xmi:id="_ulhDFwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::IntermediateThrowEvent" updateName="true" xmi:id="_ulhDGAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_LwkFEeWVleXnap4Kwg" xmi:id="_ulhDGQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDGgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_MgkFEeWVleXnap4Kwg" xmi:id="_ulhDGwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDHAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_NQkFEeWVleXnap4Kwg" xmi:id="_ulhDHQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDHgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.terminateEventDefinition" target="_ulg_OAkFEeWVleXnap4Kwg" xmi:id="_ulhDHwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TerminateEventDefinition" updateName="true" xmi:id="_ulhDIAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_OwkFEeWVleXnap4Kwg" xmi:id="_ulhDIQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDIgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_PgkFEeWVleXnap4Kwg" xmi:id="_ulhDIwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDJAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_QQkFEeWVleXnap4Kwg" xmi:id="_ulhDJQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDJgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.throwEvent" target="_ulg_RAkFEeWVleXnap4Kwg" xmi:id="_ulhDJwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ThrowEvent" updateName="true" xmi:id="_ulhDKAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_RwkFEeWVleXnap4Kwg" xmi:id="_ulhDKQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDKgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_SgkFEeWVleXnap4Kwg" xmi:id="_ulhDKwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDLAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_TQkFEeWVleXnap4Kwg" xmi:id="_ulhDLQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDLgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.boundaryEvent" target="_ulg_UAkFEeWVleXnap4Kwg" xmi:id="_ulhDLwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BoundaryEvent" updateName="true" xmi:id="_ulhDMAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_UwkFEeWVleXnap4Kwg" xmi:id="_ulhDMQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDMgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_VgkFEeWVleXnap4Kwg" xmi:id="_ulhDMwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDNAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_WQkFEeWVleXnap4Kwg" xmi:id="_ulhDNQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDNgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.implicitThrowEvent" target="_ulg_XAkFEeWVleXnap4Kwg" xmi:id="_ulhDNwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ImplicitThrowEvent" updateName="true" xmi:id="_ulhDOAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_XwkFEeWVleXnap4Kwg" xmi:id="_ulhDOQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDOgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_YgkFEeWVleXnap4Kwg" xmi:id="_ulhDOwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDPAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_ZQkFEeWVleXnap4Kwg" xmi:id="_ulhDPQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDPgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.cancelEventDefinition" target="_ulg_aAkFEeWVleXnap4Kwg" xmi:id="_ulhDPwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CancelEventDefinition" updateName="true" xmi:id="_ulhDQAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalation" target="_ulg_awkFEeWVleXnap4Kwg" xmi:id="_ulhDQQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Escalation" updateName="true" xmi:id="_ulhDQgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalation" target="_ulg_bgkFEeWVleXnap4Kwg" xmi:id="_ulhDQwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Escalation" updateName="true" xmi:id="_ulhDRAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.escalation" target="_ulg_cQkFEeWVleXnap4Kwg" xmi:id="_ulhDRQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Escalation" updateName="true" xmi:id="_ulhDRgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.textAnnotation" target="_ulg_dAkFEeWVleXnap4Kwg" xmi:id="_ulhDRwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TextAnnotation" updateName="true" xmi:id="_ulhDSAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.textAnnotation" target="_ulg_dwkFEeWVleXnap4Kwg" xmi:id="_ulhDSQkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::TextAnnotation" updateName="true" xmi:id="_ulhDSgkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.category" target="_ulg_egkFEeWVleXnap4Kwg" xmi:id="_ulhDSwkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Category" updateName="true" xmi:id="_ulhDTAkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.category" target="_ulg_fQkFEeWVleXnap4Kwg" xmi:id="_ulhlsAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Category" updateName="true" xmi:id="_ulhlsQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.category" target="_ulg_gAkFEeWVleXnap4Kwg" xmi:id="_ulhlsgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Category" updateName="true" xmi:id="_ulhlswkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNAssociation" target="_ulg_gwkFEeWVleXnap4Kwg" xmi:id="_ulhltAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNAssociation" updateName="true" xmi:id="_ulhltQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNAssociation" target="_ulg_hgkFEeWVleXnap4Kwg" xmi:id="_ulhltgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNAssociation" updateName="true" xmi:id="_ulhltwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.group" target="_ulg_iQkFEeWVleXnap4Kwg" xmi:id="_ulhluAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Group" updateName="true" xmi:id="_ulhluQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.group" target="_ulg_jAkFEeWVleXnap4Kwg" xmi:id="_ulhlugkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Group" updateName="true" xmi:id="_ulhluwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.categoryValue" target="_ulg_jwkFEeWVleXnap4Kwg" xmi:id="_ulhlvAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CategoryValue" updateName="true" xmi:id="_ulhlvQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.categoryValue" target="_ulg_kgkFEeWVleXnap4Kwg" xmi:id="_ulhlvgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CategoryValue" updateName="true" xmi:id="_ulhlvwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNArtifact" target="_ulg_lQkFEeWVleXnap4Kwg" xmi:id="_ulhlwAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNArtifact" updateName="true" xmi:id="_ulhlwQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowNode" target="_ulg_mAkFEeWVleXnap4Kwg" xmi:id="_ulhlwgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowNode" updateName="true" xmi:id="_ulhlwwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowNode" target="_ulg_mwkFEeWVleXnap4Kwg" xmi:id="_ulhlxAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowNode" updateName="true" xmi:id="_ulhlxQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.formalExpression" target="_ulg_ngkFEeWVleXnap4Kwg" xmi:id="_ulhlxgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FormalExpression" updateName="true" xmi:id="_ulhlxwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.formalExpression" target="_ulg_oQkFEeWVleXnap4Kwg" xmi:id="_ulhlyAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FormalExpression" updateName="true" xmi:id="_ulhlyQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resource" target="_ulg_pAkFEeWVleXnap4Kwg" xmi:id="_ulhlygkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Resource" updateName="true" xmi:id="_ulhlywkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resource" target="_ulg_pwkFEeWVleXnap4Kwg" xmi:id="_ulhlzAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Resource" updateName="true" xmi:id="_ulhlzQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resource" target="_ulg_qgkFEeWVleXnap4Kwg" xmi:id="_ulhlzgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Resource" updateName="true" xmi:id="_ulhlzwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowElement" target="_ulg_rQkFEeWVleXnap4Kwg" xmi:id="_ulhl0AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowElement" updateName="true" xmi:id="_ulhl0QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyBinding" target="_ulg_sAkFEeWVleXnap4Kwg" xmi:id="_ulhl0gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyBinding" updateName="true" xmi:id="_ulhl0wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyBinding" target="_ulg_swkFEeWVleXnap4Kwg" xmi:id="_ulhl1AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyBinding" updateName="true" xmi:id="_ulhl1QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationSubscription" target="_ulg_tgkFEeWVleXnap4Kwg" xmi:id="_ulhl1gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationSubscription" updateName="true" xmi:id="_ulhl1wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationSubscription" target="_ulg_uQkFEeWVleXnap4Kwg" xmi:id="_ulhl2AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationSubscription" updateName="true" xmi:id="_ulhl2QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callableElement" target="_ulg_vAkFEeWVleXnap4Kwg" xmi:id="_ulhl2gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallableElement" updateName="true" xmi:id="_ulhl2wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callableElement" target="_ulg_vwkFEeWVleXnap4Kwg" xmi:id="_ulhl3AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallableElement" updateName="true" xmi:id="_ulhl3QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callableElement" target="_ulg_wgkFEeWVleXnap4Kwg" xmi:id="_ulhl3gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallableElement" updateName="true" xmi:id="_ulhl3wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sequenceFlow" target="_ulg_xQkFEeWVleXnap4Kwg" xmi:id="_ulhl4AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SequenceFlow" updateName="true" xmi:id="_ulhl4QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sequenceFlow" target="_ulg_yAkFEeWVleXnap4Kwg" xmi:id="_ulhl4gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SequenceFlow" updateName="true" xmi:id="_ulhl4wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyRetrievalExpression" target="_ulg_ywkFEeWVleXnap4Kwg" xmi:id="_ulhl5AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyRetrievalExpression" updateName="true" xmi:id="_ulhl5QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationPropertyRetrievalExpression" target="_ulg_zgkFEeWVleXnap4Kwg" xmi:id="_ulhl5gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationPropertyRetrievalExpression" updateName="true" xmi:id="_ulhl5wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNExpression" target="_ulg_0QkFEeWVleXnap4Kwg" xmi:id="_ulhl6AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNExpression" updateName="true" xmi:id="_ulhl6QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNExpression" target="_ulg_1AkFEeWVleXnap4Kwg" xmi:id="_ulhl6gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNExpression" updateName="true" xmi:id="_ulhl6wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationProperty" target="_ulg_1wkFEeWVleXnap4Kwg" xmi:id="_ulhl7AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationProperty" updateName="true" xmi:id="_ulhl7QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationProperty" target="_ulg_2gkFEeWVleXnap4Kwg" xmi:id="_ulhl7gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationProperty" updateName="true" xmi:id="_ulhl7wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemDefinition" target="_ulg_3QkFEeWVleXnap4Kwg" xmi:id="_ulhl8AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemDefinition" updateName="true" xmi:id="_ulhl8QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemDefinition" target="_ulg_4AkFEeWVleXnap4Kwg" xmi:id="_ulhl8gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemDefinition" updateName="true" xmi:id="_ulhl8wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemDefinition" target="_ulg_4wkFEeWVleXnap4Kwg" xmi:id="_ulhl9AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemDefinition" updateName="true" xmi:id="_ulhl9QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationKey" target="_ulg_5gkFEeWVleXnap4Kwg" xmi:id="_ulhl9gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationKey" updateName="true" xmi:id="_ulhl9wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.correlationKey" target="_ulg_6QkFEeWVleXnap4Kwg" xmi:id="_ulhl-AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CorrelationKey" updateName="true" xmi:id="_ulhl-QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.flowElementsContainer" target="_ulg_7AkFEeWVleXnap4Kwg" xmi:id="_ulhl-gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::FlowElementsContainer" updateName="true" xmi:id="_ulhl-wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNMessage" target="_ulg_7wkFEeWVleXnap4Kwg" xmi:id="_ulhl_AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNMessage" updateName="true" xmi:id="_ulhl_QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNMessage" target="_ulg_8gkFEeWVleXnap4Kwg" xmi:id="_ulhl_gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNMessage" updateName="true" xmi:id="_ulhl_wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNMessage" target="_ulg_9QkFEeWVleXnap4Kwg" xmi:id="_ulhmAAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNMessage" updateName="true" xmi:id="_ulhmAQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameter" target="_ulg_-AkFEeWVleXnap4Kwg" xmi:id="_ulhmAgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameter" updateName="true" xmi:id="_ulhmAwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameter" target="_ulg_-wkFEeWVleXnap4Kwg" xmi:id="_ulhmBAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameter" updateName="true" xmi:id="_ulhmBQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.outputSet" target="_ulg__gkFEeWVleXnap4Kwg" xmi:id="_ulhmBgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::OutputSet" updateName="true" xmi:id="_ulhmBwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.outputSet" target="_ulhAAQkFEeWVleXnap4Kwg" xmi:id="_ulhmCAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::OutputSet" updateName="true" xmi:id="_ulhmCQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputSet" target="_ulhABAkFEeWVleXnap4Kwg" xmi:id="_ulhmCgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputSet" updateName="true" xmi:id="_ulhmCwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputSet" target="_ulhABwkFEeWVleXnap4Kwg" xmi:id="_ulhmDAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputSet" updateName="true" xmi:id="_ulhmDQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataState" target="_ulhACgkFEeWVleXnap4Kwg" xmi:id="_ulhmDgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataState" updateName="true" xmi:id="_ulhmDwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataState" target="_ulhADQkFEeWVleXnap4Kwg" xmi:id="_ulhmEAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataState" updateName="true" xmi:id="_ulhmEQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObjectReference" target="_ulhAEAkFEeWVleXnap4Kwg" xmi:id="_ulhmEgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObjectReference" updateName="true" xmi:id="_ulhmEwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObjectReference" target="_ulhAEwkFEeWVleXnap4Kwg" xmi:id="_ulhmFAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObjectReference" updateName="true" xmi:id="_ulhmFQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObjectReference" target="_ulhAFgkFEeWVleXnap4Kwg" xmi:id="_ulhmFgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObjectReference" updateName="true" xmi:id="_ulhmFwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutputAssociation" target="_ulhAGQkFEeWVleXnap4Kwg" xmi:id="_ulhmGAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutputAssociation" updateName="true" xmi:id="_ulhmGQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutputAssociation" target="_ulhAHAkFEeWVleXnap4Kwg" xmi:id="_ulhmGgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutputAssociation" updateName="true" xmi:id="_ulhmGwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputBinding" target="_ulhAHwkFEeWVleXnap4Kwg" xmi:id="_ulhmHAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputBinding" updateName="true" xmi:id="_ulhmHQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputBinding" target="_ulhAIgkFEeWVleXnap4Kwg" xmi:id="_ulhmHgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputBinding" updateName="true" xmi:id="_ulhmHwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.assignment" target="_ulhAJQkFEeWVleXnap4Kwg" xmi:id="_ulhmIAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Assignment" updateName="true" xmi:id="_ulhmIQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.assignment" target="_ulhAKAkFEeWVleXnap4Kwg" xmi:id="_ulhmIgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Assignment" updateName="true" xmi:id="_ulhmIwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhAKwkFEeWVleXnap4Kwg" xmi:id="_ulhmJAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmJQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhALgkFEeWVleXnap4Kwg" xmi:id="_ulhmJgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmJwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhAMQkFEeWVleXnap4Kwg" xmi:id="_ulhmKAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmKQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhANAkFEeWVleXnap4Kwg" xmi:id="_ulhmKgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmKwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataOutput" target="_ulhANwkFEeWVleXnap4Kwg" xmi:id="_ulhmLAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataOutput" updateName="true" xmi:id="_ulhmLQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProperty" target="_ulhAOgkFEeWVleXnap4Kwg" xmi:id="_ulhmLgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProperty" updateName="true" xmi:id="_ulhmLwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProperty" target="_ulhAPQkFEeWVleXnap4Kwg" xmi:id="_ulhmMAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProperty" updateName="true" xmi:id="_ulhmMQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNProperty" target="_ulhAQAkFEeWVleXnap4Kwg" xmi:id="_ulhmMgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNProperty" updateName="true" xmi:id="_ulhmMwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemAwareElement" target="_ulhAQwkFEeWVleXnap4Kwg" xmi:id="_ulhmNAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemAwareElement" updateName="true" xmi:id="_ulhmNQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.itemAwareElement" target="_ulhARgkFEeWVleXnap4Kwg" xmi:id="_ulhmNgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ItemAwareElement" updateName="true" xmi:id="_ulhmNwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputSpecification" target="_ulhASQkFEeWVleXnap4Kwg" xmi:id="_ulhmOAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputSpecification" updateName="true" xmi:id="_ulhmOQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputSpecification" target="_ulhATAkFEeWVleXnap4Kwg" xmi:id="_ulhmOgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputSpecification" updateName="true" xmi:id="_ulhmOwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.inputOutputSpecification" target="_ulhATwkFEeWVleXnap4Kwg" xmi:id="_ulhmPAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InputOutputSpecification" updateName="true" xmi:id="_ulhmPQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStore" target="_ulhAUgkFEeWVleXnap4Kwg" xmi:id="_ulhmPgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStore" updateName="true" xmi:id="_ulhmPwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStore" target="_ulhAVQkFEeWVleXnap4Kwg" xmi:id="_ulhmQAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStore" updateName="true" xmi:id="_ulhmQQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStore" target="_ulhAWAkFEeWVleXnap4Kwg" xmi:id="_ulhmQgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStore" updateName="true" xmi:id="_ulhmQwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInputAssociation" target="_ulhAWwkFEeWVleXnap4Kwg" xmi:id="_ulhmRAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInputAssociation" updateName="true" xmi:id="_ulhmRQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInputAssociation" target="_ulhAXgkFEeWVleXnap4Kwg" xmi:id="_ulhmRgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInputAssociation" updateName="true" xmi:id="_ulhmRwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStoreReference" target="_ulhAYQkFEeWVleXnap4Kwg" xmi:id="_ulhmSAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStoreReference" updateName="true" xmi:id="_ulhmSQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStoreReference" target="_ulhAZAkFEeWVleXnap4Kwg" xmi:id="_ulhmSgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStoreReference" updateName="true" xmi:id="_ulhmSwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataStoreReference" target="_ulhAZwkFEeWVleXnap4Kwg" xmi:id="_ulhmTAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataStoreReference" updateName="true" xmi:id="_ulhmTQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObject" target="_ulhAagkFEeWVleXnap4Kwg" xmi:id="_ulhmTgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObject" updateName="true" xmi:id="_ulhmTwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObject" target="_ulhAbQkFEeWVleXnap4Kwg" xmi:id="_ulhmUAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObject" updateName="true" xmi:id="_ulhmUQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataObject" target="_ulhAcAkFEeWVleXnap4Kwg" xmi:id="_ulhmUgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataObject" updateName="true" xmi:id="_ulhmUwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAcwkFEeWVleXnap4Kwg" xmi:id="_ulhmVAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmVQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAdgkFEeWVleXnap4Kwg" xmi:id="_ulhmVgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmVwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAeQkFEeWVleXnap4Kwg" xmi:id="_ulhmWAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmWQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAfAkFEeWVleXnap4Kwg" xmi:id="_ulhmWgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmWwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataInput" target="_ulhAfwkFEeWVleXnap4Kwg" xmi:id="_ulhmXAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataInput" updateName="true" xmi:id="_ulhmXQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataAssociation" target="_ulhAggkFEeWVleXnap4Kwg" xmi:id="_ulhmXgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataAssociation" updateName="true" xmi:id="_ulhmXwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.dataAssociation" target="_ulhAhQkFEeWVleXnap4Kwg" xmi:id="_ulhmYAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::DataAssociation" updateName="true" xmi:id="_ulhmYQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAiAkFEeWVleXnap4Kwg" xmi:id="_ulhmYgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmYwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAiwkFEeWVleXnap4Kwg" xmi:id="_ulhmZAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmZQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAjgkFEeWVleXnap4Kwg" xmi:id="_ulhmZgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmZwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.userTask" target="_ulhAkQkFEeWVleXnap4Kwg" xmi:id="_ulhmaAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::UserTask" updateName="true" xmi:id="_ulhmaQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.humanPerformer" target="_ulhAlAkFEeWVleXnap4Kwg" xmi:id="_ulhmagkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::HumanPerformer" updateName="true" xmi:id="_ulhmawkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.humanPerformer" target="_ulhAlwkFEeWVleXnap4Kwg" xmi:id="_ulhmbAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::HumanPerformer" updateName="true" xmi:id="_ulhmbQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAmgkFEeWVleXnap4Kwg" xmi:id="_ulhmbgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmbwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAnQkFEeWVleXnap4Kwg" xmi:id="_ulhmcAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmcQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAoAkFEeWVleXnap4Kwg" xmi:id="_ulhmcgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmcwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalUserTask" target="_ulhAowkFEeWVleXnap4Kwg" xmi:id="_ulhmdAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalUserTask" updateName="true" xmi:id="_ulhmdQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rendering" target="_ulhApgkFEeWVleXnap4Kwg" xmi:id="_ulhmdgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Rendering" updateName="true" xmi:id="_ulhmdwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.rendering" target="_ulhAqQkFEeWVleXnap4Kwg" xmi:id="_ulhmeAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Rendering" updateName="true" xmi:id="_ulhmeQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhArAkFEeWVleXnap4Kwg" xmi:id="_ulhmegkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmewkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhArwkFEeWVleXnap4Kwg" xmi:id="_ulhmfAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmfQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhAsgkFEeWVleXnap4Kwg" xmi:id="_ulhmfgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmfwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalManualTask" target="_ulhAtQkFEeWVleXnap4Kwg" xmi:id="_ulhmgAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalManualTask" updateName="true" xmi:id="_ulhmgQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAuAkFEeWVleXnap4Kwg" xmi:id="_ulhmggkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmgwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAuwkFEeWVleXnap4Kwg" xmi:id="_ulhmhAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmhQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAvgkFEeWVleXnap4Kwg" xmi:id="_ulhmhgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmhwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.manualTask" target="_ulhAwQkFEeWVleXnap4Kwg" xmi:id="_ulhmiAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ManualTask" updateName="true" xmi:id="_ulhmiQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.potentialOwner" target="_ulhAxAkFEeWVleXnap4Kwg" xmi:id="_ulhmigkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PotentialOwner" updateName="true" xmi:id="_ulhmiwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.potentialOwner" target="_ulhAxwkFEeWVleXnap4Kwg" xmi:id="_ulhmjAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PotentialOwner" updateName="true" xmi:id="_ulhmjQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.interactionNode" target="_ulhAygkFEeWVleXnap4Kwg" xmi:id="_ulhmjgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::InteractionNode" updateName="true" xmi:id="_ulhmjwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participant" target="_ulhAzQkFEeWVleXnap4Kwg" xmi:id="_ulhmkAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Participant" updateName="true" xmi:id="_ulhmkQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participant" target="_ulhA0AkFEeWVleXnap4Kwg" xmi:id="_ulhmkgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Participant" updateName="true" xmi:id="_ulhmkwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerRole" target="_ulhA0wkFEeWVleXnap4Kwg" xmi:id="_ulhmlAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerRole" updateName="true" xmi:id="_ulhmlQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerRole" target="_ulhA1gkFEeWVleXnap4Kwg" xmi:id="_ulhmlgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerRole" updateName="true" xmi:id="_ulhmlwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerRole" target="_ulhA2QkFEeWVleXnap4Kwg" xmi:id="_ulhmmAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerRole" updateName="true" xmi:id="_ulhmmQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlow_UML::InformationFlow" target="_ulhA3AkFEeWVleXnap4Kwg" xmi:id="_ulhmmgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlow" updateName="true" xmi:id="_ulhmmwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlow" target="_ulhA3wkFEeWVleXnap4Kwg" xmi:id="_ulhmnAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlow" updateName="true" xmi:id="_ulhmnQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNCollaboration" target="_ulhA4gkFEeWVleXnap4Kwg" xmi:id="_ulhmngkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNCollaboration" updateName="true" xmi:id="_ulhmnwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNCollaboration" target="_ulhA5QkFEeWVleXnap4Kwg" xmi:id="_ulhmoAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNCollaboration" updateName="true" xmi:id="_ulhmoQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNCollaboration" target="_ulhA6AkFEeWVleXnap4Kwg" xmi:id="_ulhmogkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNCollaboration" updateName="true" xmi:id="_ulhmowkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlowAssociation" target="_ulhA6wkFEeWVleXnap4Kwg" xmi:id="_ulhmpAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlowAssociation" updateName="true" xmi:id="_ulhmpQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.messageFlowAssociation" target="_ulhA7gkFEeWVleXnap4Kwg" xmi:id="_ulhmpgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MessageFlowAssociation" updateName="true" xmi:id="_ulhmpwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerEntity" target="_ulhA8QkFEeWVleXnap4Kwg" xmi:id="_ulhmqAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerEntity" updateName="true" xmi:id="_ulhmqQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerEntity" target="_ulhA9AkFEeWVleXnap4Kwg" xmi:id="_ulhmqgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerEntity" updateName="true" xmi:id="_ulhmqwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.partnerEntity" target="_ulhA9wkFEeWVleXnap4Kwg" xmi:id="_ulhmrAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::PartnerEntity" updateName="true" xmi:id="_ulhmrQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantAssociation" target="_ulhA-gkFEeWVleXnap4Kwg" xmi:id="_ulhmrgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantAssociation" updateName="true" xmi:id="_ulhmrwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantAssociation" target="_ulhA_QkFEeWVleXnap4Kwg" xmi:id="_ulhmsAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantAssociation" updateName="true" xmi:id="_ulhmsQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantMultiplicity" target="_ulhBAAkFEeWVleXnap4Kwg" xmi:id="_ulhmsgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantMultiplicity" updateName="true" xmi:id="_ulhmswkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.participantMultiplicity" target="_ulhBAwkFEeWVleXnap4Kwg" xmi:id="_ulhmtAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ParticipantMultiplicity" updateName="true" xmi:id="_ulhmtQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.documentation" target="_ulhBBgkFEeWVleXnap4Kwg" xmi:id="_ulhmtgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Documentation" updateName="true" xmi:id="_ulhmtwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.documentation" target="_ulhBCQkFEeWVleXnap4Kwg" xmi:id="_ulhmuAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Documentation" updateName="true" xmi:id="_ulhmuQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.extensionDefinition" target="_ulhBDAkFEeWVleXnap4Kwg" xmi:id="_ulhmugkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExtensionDefinition" updateName="true" xmi:id="_ulhmuwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNRelationship" target="_ulhBDwkFEeWVleXnap4Kwg" xmi:id="_ulhmvAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNRelationship" updateName="true" xmi:id="_ulhmvQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNRelationship" target="_ulhBEgkFEeWVleXnap4Kwg" xmi:id="_ulhmvgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNRelationship" updateName="true" xmi:id="_ulhmvwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.baseElement" target="_ulhBFQkFEeWVleXnap4Kwg" xmi:id="_ulhmwAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BaseElement" updateName="true" xmi:id="_ulhmwQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.extensionAttributeValue" target="_ulhBGAkFEeWVleXnap4Kwg" xmi:id="_ulhmwgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExtensionAttributeValue" updateName="true" xmi:id="_ulhmwwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.extensionAttributeDefinition" target="_ulhBGwkFEeWVleXnap4Kwg" xmi:id="_ulhmxAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ExtensionAttributeDefinition" updateName="true" xmi:id="_ulhmxQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNExtension" target="_ulhBHgkFEeWVleXnap4Kwg" xmi:id="_ulhmxgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNExtension" updateName="true" xmi:id="_ulhmxwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNOperation" target="_ulhBIQkFEeWVleXnap4Kwg" xmi:id="_ulhmyAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNOperation" updateName="true" xmi:id="_ulhmyQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNOperation" target="_ulhBJAkFEeWVleXnap4Kwg" xmi:id="_ulhmygkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNOperation" updateName="true" xmi:id="_ulhmywkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNInterface" target="_ulhBJwkFEeWVleXnap4Kwg" xmi:id="_ulhmzAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNInterface" updateName="true" xmi:id="_ulhmzQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNInterface" target="_ulhBKgkFEeWVleXnap4Kwg" xmi:id="_ulhmzgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNInterface" updateName="true" xmi:id="_ulhmzwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNInterface" target="_ulhBLQkFEeWVleXnap4Kwg" xmi:id="_ulhm0AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNInterface" updateName="true" xmi:id="_ulhm0QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subConversation_UML::InformationFlow" target="_ulhBMAkFEeWVleXnap4Kwg" xmi:id="_ulhm0gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubConversation" updateName="true" xmi:id="_ulhm0wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subConversation" target="_ulhBMwkFEeWVleXnap4Kwg" xmi:id="_ulhm1AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubConversation" updateName="true" xmi:id="_ulhm1QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationNode_UML::InformationFlow" target="_ulhBNgkFEeWVleXnap4Kwg" xmi:id="_ulhm1gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationNode" updateName="true" xmi:id="_ulhm1wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationNode" target="_ulhBOQkFEeWVleXnap4Kwg" xmi:id="_ulhm2AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationNode" updateName="true" xmi:id="_ulhm2QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalConversation" target="_ulhBPAkFEeWVleXnap4Kwg" xmi:id="_ulhm2gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalConversation" updateName="true" xmi:id="_ulhm2wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalConversation" target="_ulhBPwkFEeWVleXnap4Kwg" xmi:id="_ulhm3AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalConversation" updateName="true" xmi:id="_ulhm3QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.globalConversation" target="_ulhBQgkFEeWVleXnap4Kwg" xmi:id="_ulhm3gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::GlobalConversation" updateName="true" xmi:id="_ulhm3wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callConversation_UML::InformationFlow" target="_ulhBRQkFEeWVleXnap4Kwg" xmi:id="_ulhm4AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallConversation" updateName="true" xmi:id="_ulhm4QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callConversation" target="_ulhBSAkFEeWVleXnap4Kwg" xmi:id="_ulhm4gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallConversation" updateName="true" xmi:id="_ulhm4wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversation_UML::InformationFlow" target="_ulhBSwkFEeWVleXnap4Kwg" xmi:id="_ulhm5AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Conversation" updateName="true" xmi:id="_ulhm5QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversation" target="_ulhBTgkFEeWVleXnap4Kwg" xmi:id="_ulhm5gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Conversation" updateName="true" xmi:id="_ulhm5wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationLink" target="_ulhBUQkFEeWVleXnap4Kwg" xmi:id="_ulhm6AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationLink" updateName="true" xmi:id="_ulhm6QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.conversationLink" target="_ulhBVAkFEeWVleXnap4Kwg" xmi:id="_ulhm6gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ConversationLink" updateName="true" xmi:id="_ulhm6wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBVwkFEeWVleXnap4Kwg" xmi:id="_ulhm7AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm7QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBWgkFEeWVleXnap4Kwg" xmi:id="_ulhm7gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm7wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBXQkFEeWVleXnap4Kwg" xmi:id="_ulhm8AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm8QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.subProcess" target="_ulhBYAkFEeWVleXnap4Kwg" xmi:id="_ulhm8gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SubProcess" updateName="true" xmi:id="_ulhm8wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.performer" target="_ulhBYwkFEeWVleXnap4Kwg" xmi:id="_ulhm9AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Performer" updateName="true" xmi:id="_ulhm9QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.performer" target="_ulhBZgkFEeWVleXnap4Kwg" xmi:id="_ulhm9gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Performer" updateName="true" xmi:id="_ulhm9wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNActivity" target="_ulhBaQkFEeWVleXnap4Kwg" xmi:id="_ulhm-AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNActivity" updateName="true" xmi:id="_ulhm-QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNActivity" target="_ulhBbAkFEeWVleXnap4Kwg" xmi:id="_ulhm-gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNActivity" updateName="true" xmi:id="_ulhm-wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.bPMNActivity" target="_ulhBbwkFEeWVleXnap4Kwg" xmi:id="_ulhm_AkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BPMNActivity" updateName="true" xmi:id="_ulhm_QkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.loopCharacteristics" target="_ulhBcgkFEeWVleXnap4Kwg" xmi:id="_ulhm_gkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LoopCharacteristics" updateName="true" xmi:id="_ulhm_wkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.loopCharacteristics" target="_ulhBdQkFEeWVleXnap4Kwg" xmi:id="_ulhnAAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::LoopCharacteristics" updateName="true" xmi:id="_ulhnAQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBeAkFEeWVleXnap4Kwg" xmi:id="_ulhnAgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnAwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBewkFEeWVleXnap4Kwg" xmi:id="_ulhnBAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnBQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBfgkFEeWVleXnap4Kwg" xmi:id="_ulhnBgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnBwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.callActivity" target="_ulhBgQkFEeWVleXnap4Kwg" xmi:id="_ulhnCAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::CallActivity" updateName="true" xmi:id="_ulhnCQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceRole" target="_ulhBhAkFEeWVleXnap4Kwg" xmi:id="_ulhnCgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceRole" updateName="true" xmi:id="_ulhnCwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceRole" target="_ulhBhwkFEeWVleXnap4Kwg" xmi:id="_ulhnDAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceRole" updateName="true" xmi:id="_ulhnDQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBigkFEeWVleXnap4Kwg" xmi:id="_ulhnDgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnDwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBjQkFEeWVleXnap4Kwg" xmi:id="_ulhnEAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnEQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBkAkFEeWVleXnap4Kwg" xmi:id="_ulhnEgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnEwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.businessRuleTask" target="_ulhBkwkFEeWVleXnap4Kwg" xmi:id="_ulhnFAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::BusinessRuleTask" updateName="true" xmi:id="_ulhnFQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexBehaviorDefinition" target="_ulhBlgkFEeWVleXnap4Kwg" xmi:id="_ulhnFgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexBehaviorDefinition" updateName="true" xmi:id="_ulhnFwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.complexBehaviorDefinition" target="_ulhBmQkFEeWVleXnap4Kwg" xmi:id="_ulhnGAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ComplexBehaviorDefinition" updateName="true" xmi:id="_ulhnGQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceAssignmentExpression" target="_ulhBnAkFEeWVleXnap4Kwg" xmi:id="_ulhnGgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceAssignmentExpression" updateName="true" xmi:id="_ulhnGwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceAssignmentExpression" target="_ulhBnwkFEeWVleXnap4Kwg" xmi:id="_ulhnHAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceAssignmentExpression" updateName="true" xmi:id="_ulhnHQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBogkFEeWVleXnap4Kwg" xmi:id="_ulhnHgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnHwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBpQkFEeWVleXnap4Kwg" xmi:id="_ulhnIAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnIQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBqAkFEeWVleXnap4Kwg" xmi:id="_ulhnIgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnIwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.adHocSubProcess" target="_ulhBqwkFEeWVleXnap4Kwg" xmi:id="_ulhnJAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::AdHocSubProcess" updateName="true" xmi:id="_ulhnJQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBrgkFEeWVleXnap4Kwg" xmi:id="_ulhnJgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnJwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBsQkFEeWVleXnap4Kwg" xmi:id="_ulhnKAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnKQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBtAkFEeWVleXnap4Kwg" xmi:id="_ulhnKgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnKwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.scriptTask" target="_ulhBtwkFEeWVleXnap4Kwg" xmi:id="_ulhnLAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ScriptTask" updateName="true" xmi:id="_ulhnLQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBugkFEeWVleXnap4Kwg" xmi:id="_ulhnLgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhnLwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBvQkFEeWVleXnap4Kwg" xmi:id="_ulhnMAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhnMQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBwAkFEeWVleXnap4Kwg" xmi:id="_ulhnMgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhnMwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhBwwkFEeWVleXnap4Kwg" xmi:id="_ulhnNAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnNQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhBxgkFEeWVleXnap4Kwg" xmi:id="_ulhnNgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnNwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhByQkFEeWVleXnap4Kwg" xmi:id="_ulhnOAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnOQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.sendTask" target="_ulhBzAkFEeWVleXnap4Kwg" xmi:id="_ulhnOgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::SendTask" updateName="true" xmi:id="_ulhnOwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhBzwkFEeWVleXnap4Kwg" xmi:id="_ulhnPAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnPQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhB0gkFEeWVleXnap4Kwg" xmi:id="_ulhnPgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnPwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhB1QkFEeWVleXnap4Kwg" xmi:id="_ulhnQAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnQQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.transaction" target="_ulhB2AkFEeWVleXnap4Kwg" xmi:id="_ulhnQgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Transaction" updateName="true" xmi:id="_ulhnQwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.standardLoopCharacteristics" target="_ulhB2wkFEeWVleXnap4Kwg" xmi:id="_ulhnRAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StandardLoopCharacteristics" updateName="true" xmi:id="_ulhnRQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.standardLoopCharacteristics" target="_ulhB3gkFEeWVleXnap4Kwg" xmi:id="_ulhnRgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StandardLoopCharacteristics" updateName="true" xmi:id="_ulhnRwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.standardLoopCharacteristics" target="_ulhB4QkFEeWVleXnap4Kwg" xmi:id="_ulhnSAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::StandardLoopCharacteristics" updateName="true" xmi:id="_ulhnSQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB5AkFEeWVleXnap4Kwg" xmi:id="_ulhnSgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnSwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB5wkFEeWVleXnap4Kwg" xmi:id="_ulhnTAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnTQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB6gkFEeWVleXnap4Kwg" xmi:id="_ulhnTgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnTwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.receiveTask" target="_ulhB7QkFEeWVleXnap4Kwg" xmi:id="_ulhnUAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ReceiveTask" updateName="true" xmi:id="_ulhnUQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameterBinding" target="_ulhB8AkFEeWVleXnap4Kwg" xmi:id="_ulhnUgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameterBinding" updateName="true" xmi:id="_ulhnUwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.resourceParameterBinding" target="_ulhB8wkFEeWVleXnap4Kwg" xmi:id="_ulhnVAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ResourceParameterBinding" updateName="true" xmi:id="_ulhnVQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB9gkFEeWVleXnap4Kwg" xmi:id="_ulhnVgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnVwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB-QkFEeWVleXnap4Kwg" xmi:id="_ulhnWAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnWQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB_AkFEeWVleXnap4Kwg" xmi:id="_ulhnWgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnWwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.serviceTask" target="_ulhB_wkFEeWVleXnap4Kwg" xmi:id="_ulhnXAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::ServiceTask" updateName="true" xmi:id="_ulhnXQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.multiInstanceLoopCharacteristics" target="_ulhCAgkFEeWVleXnap4Kwg" xmi:id="_ulhnXgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MultiInstanceLoopCharacteristics" updateName="true" xmi:id="_ulhnXwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.multiInstanceLoopCharacteristics" target="_ulhCBQkFEeWVleXnap4Kwg" xmi:id="_ulhnYAkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MultiInstanceLoopCharacteristics" updateName="true" xmi:id="_ulhnYQkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.multiInstanceLoopCharacteristics" target="_ulhCCAkFEeWVleXnap4Kwg" xmi:id="_ulhnYgkFEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::MultiInstanceLoopCharacteristics" updateName="true" xmi:id="_ulhnYwkFEeWVleXnap4Kwg">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations
index 73c941e56ac..353f3e70f0e 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/customBpmn.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.customElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_ulgXkAkFEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.Task_OpaqueAction" name="Task Action" xmi:id="_ulhBugkFEeWVleXnap4Kwg1" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBuwkFEeWVleXnap4Kwg2"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-    <matcherConfiguration xmi:id="_ulhBvAkFEeWVleXnap4Kwg1" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBugkFEeWVleXnap4Kwg1" xmi:id="_ulhCCwkFEeWVleXnap4Kwg5" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhCDAkFEeWVleXnap4Kwg6">
-      <requiredProfiles>BPMNProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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.customElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_ulgXkAkFEeWVleXnap4Kwg" xmi:version="2.0">

+  <elementTypeConfigurations hint="UML::Action" identifier="org.eclipse.papyrus.bpmn.Task_OpaqueAction" name="Task Action" xmi:id="_ulhBugkFEeWVleXnap4Kwg1" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ulhBuwkFEeWVleXnap4Kwg2"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+    <matcherConfiguration xmi:id="_ulhBvAkFEeWVleXnap4Kwg1" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>BPMNProfile::Task</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.task" target="_ulhBugkFEeWVleXnap4Kwg1" xmi:id="_ulhCCwkFEeWVleXnap4Kwg5" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Task" updateName="true" xmi:id="_ulhCDAkFEeWVleXnap4Kwg6">

+      <requiredProfiles>BPMNProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml
index 4705c38d506..6c1ecc5335a 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml
@@ -34,14 +34,14 @@
       </profile>
    </extension>
     <extension
-          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
        <elementTypeSet
              clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
              path="model/bpmn.elementtypesconfigurations">
        </elementTypeSet>
     </extension>
     <extension
-          point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+          point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
        <elementTypeSet
              clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
              path="model/customBpmn.elementtypesconfigurations">
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF
index 0cd52338d3e..9909cf78989 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

  org.eclipse.papyrus.umlrt;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  org.eclipse.emf.ecore,

  org.eclipse.uml2.uml,

  org.eclipse.papyrus.emf.facet.efacet.core;bundle-version="1.2.0",

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
index a861015c245..5e672fcdb35 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  org.eclipse.gmf.runtime.emf.type.core,

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

  org.eclipse.papyrus.dsml.validation;bundle-version="1.2.0",

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
index 3841ae4a75e..e1f383789d0 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
@@ -1,375 +1,132 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
-    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
-    xmi:id="_ubJcsKeUEeSUR5jX0TaAcA"
-    name="UMLRealTime"
-    identifier="org.eclipse.papyrus.umlrt.elementTypes"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJcsaeUEeSUR5jX0TaAcA"
-      name="Capsule"
-      identifier="org.eclipse.papyrus.umlrt.Capsule">
-    <iconEntry
-        xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_jrBH8P7pEeSx0Yn0jzU15g"
-        name="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice"
-        description="Advice for Capsule"
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcs6eUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJctKeUEeSUR5jX0TaAcA"
-      name="CapsulePart"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart">
-    <iconEntry
-        xmi:id="_ubJctaeUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJctqeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJct6eUEeSUR5jX0TaAcA"
-      name="Protocol"
-      identifier="org.eclipse.papyrus.umlrt.Protocol">
-    <iconEntry
-        xmi:id="_ubJcuKeUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Collaboration.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_Z9YkQM2BEeSdoOwgSyouYw"
-        name="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
-        description="Advice for Protocol"
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcuaeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJcuqeUEeSUR5jX0TaAcA"
-      name="RTPort"
-      identifier="org.eclipse.papyrus.umlrt.RTPort">
-    <iconEntry
-        xmi:id="_ubJcu6eUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Port.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcvKeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJcvaeUEeSUR5jX0TaAcA"
-      name="RTConnector"
-      identifier="org.eclipse.papyrus.umlrt.RTConnector">
-    <iconEntry
-        xmi:id="_ubJcvqeUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Connector.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcv6eUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTConnector</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJcwKeUEeSUR5jX0TaAcA"
-      name="ProtocolContainer"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer">
-    <iconEntry
-        xmi:id="_ubJcwaeUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Package.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_5m7RcOc2EeSW0_lDigZ13g"
-        name="Protocol Container Advice"
-        identifier="org.eclipse.papyrus.umlrt.ProcotolContainerAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolContainerEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcwqeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJcw6eUEeSUR5jX0TaAcA"
-      name="RTRExcludedElement"
-      identifier="org.eclipse.papyrus.umlrt.RTRExcludedElement">
-    <iconEntry
-        xmi:id="_ubJcxKeUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/RedefinableElement.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcxaeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTRExcludedElement</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_ubJcxqeUEeSUR5jX0TaAcA"
-      name="RTMessageSet"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet">
-    <iconEntry
-        xmi:id="_ubJcx6eUEeSUR5jX0TaAcA"
-        iconPath="/icons/full/obj16/Interface.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_1caKcOUVEeSW0_lDigZ13g"
-        name="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice"
-        description="Edit helper advice on "
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice"/>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_ubJcyKeUEeSUR5jX0TaAcA">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_At0JAONwEeSMDu6IBsn9eg"
-      name="ProtocolMessage"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessage">
-    <iconEntry
-        xmi:id="_At0JAeNwEeSMDu6IBsn9eg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_At0JAuNwEeSMDu6IBsn9eg"
-        name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice"
-        description="advice for Operation"
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xmi:id="_OPE2wOqQEeS-F5lSZrhlvg"
-        matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_1puuMOToEeSW0_lDigZ13g"
-      name="ProtocolMessageIN"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn">
-    <iconEntry
-        xmi:id="_7aYeMOToEeSW0_lDigZ13g"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_7aZFQOToEeSW0_lDigZ13g"
-        name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
-        description="advice for Operation as Message IN"
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xmi:id="_PLPkEOqQEeS-F5lSZrhlvg"
-        matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageInMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_Vv9-gOzDEeSbg9FMiG2BVg"
-      name="ProtocolMessageOUT"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut">
-    <iconEntry
-        xmi:id="_Vv9-gezDEeSbg9FMiG2BVg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_Vv9-guzDEeSbg9FMiG2BVg"
-        name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageOutEditHelperAdvice"
-        description="advice for Operation as RTMessage OUT"
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageOutEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageOutEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xmi:id="_Vv9-g-zDEeSbg9FMiG2BVg"
-        matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageOutMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_WBNfgOzDEeSbg9FMiG2BVg"
-      name="ProtocolMessageINOUT"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut">
-    <iconEntry
-        xmi:id="_WBNfgezDEeSbg9FMiG2BVg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>
-    <editHelperAdviceConfiguration
-        xmi:id="_WBNfguzDEeSbg9FMiG2BVg"
-        name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInOutEditHelperAdvice"
-        description="advice for Operation as Message INOUT"
-        identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInOutEditHelperAdvice"
-        editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInOutEditHelperAdvice"
-        inheritance="all"/>
-    <matcherConfiguration
-        xmi:id="_WBNfg-zDEeSbg9FMiG2BVg"
-        matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageInOutMatcher"/>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJcyaeUEeSUR5jX0TaAcA"
-      name="Apply Capsule"
-      identifier="org.eclipse.papyrus.umlrt.capsule"
-      target="_ubJcsaeUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJcyqeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::Capsule"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJcy6eUEeSUR5jX0TaAcA"
-      name="Apply CapsulePart"
-      identifier="org.eclipse.papyrus.umlrt.capsulePart"
-      target="_ubJctKeUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJczKeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::CapsulePart"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJczaeUEeSUR5jX0TaAcA"
-      name="Apply Protocol"
-      identifier="org.eclipse.papyrus.umlrt.protocol"
-      target="_ubJct6eUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJczqeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::Protocol"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJcz6eUEeSUR5jX0TaAcA"
-      name="Apply RTPort"
-      identifier="org.eclipse.papyrus.umlrt.rTPort"
-      target="_ubJcuqeUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJc0KeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::RTPort"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJc0aeUEeSUR5jX0TaAcA"
-      name="Apply RTConnector"
-      identifier="org.eclipse.papyrus.umlrt.rTConnector"
-      target="_ubJcvaeUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJc0qeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::RTConnector"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJc06eUEeSUR5jX0TaAcA"
-      name="Apply ProtocolContainer"
-      identifier="org.eclipse.papyrus.umlrt.protocolContainer"
-      target="_ubJcwKeUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJc1KeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::ProtocolContainer"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJc1aeUEeSUR5jX0TaAcA"
-      name="Apply RTRExcludedElement"
-      identifier="org.eclipse.papyrus.umlrt.rTRExcludedElement"
-      target="_ubJcw6eUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJc1qeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::RTRExcludedElement"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_ubJc16eUEeSUR5jX0TaAcA"
-      name="Apply RTMessageSet"
-      identifier="org.eclipse.papyrus.umlrt.rTMessageSet"
-      target="_ubJcxqeUEeSUR5jX0TaAcA">
-    <stereotypesToApply
-        xmi:id="_ubJc2KeUEeSUR5jX0TaAcA"
-        stereotypeQualifiedName="UMLRealTime::RTMessageSet"
-        updateName="true">
-      <requiredProfiles>UMLRealTime</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xmi:id="_Mb9lIOc0EeSW0_lDigZ13g"
-      name="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice"
-      identifier="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice"
-      editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNtlYCEeS0WsAAtVmToA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xmi:id="_72t-8AXkEeW5T4E9mdKXVA"
-      name="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice"
-      identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice"
-      editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-        href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc8ZVFYCEeS0WsAAtVmToA"/>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?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.umlrt.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLRealTime" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.Capsule" name="Capsule" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <editHelperAdviceConfiguration description="Advice for Capsule" editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.CapsuleEditHelperAdvice" xmi:id="_jrBH8P7pEeSx0Yn0jzU15g" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.CapsulePart" name="CapsulePart" xmi:id="_ubJctKeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_ubJctaeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <matcherConfiguration xmi:id="_ubJctqeUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.Protocol" name="Protocol" xmi:id="_ubJct6eUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_ubJcuKeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+    <editHelperAdviceConfiguration description="Advice for Protocol" editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolEditHelperAdvice" xmi:id="_Z9YkQM2BEeSdoOwgSyouYw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration xmi:id="_ubJcuaeUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.RTPort" name="RTPort" xmi:id="_ubJcuqeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_ubJcu6eUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

+    <matcherConfiguration xmi:id="_ubJcvKeUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTPort</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.RTConnector" name="RTConnector" xmi:id="_ubJcvaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_ubJcvqeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

+    <matcherConfiguration xmi:id="_ubJcv6eUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTConnector</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.ProtocolContainer" name="ProtocolContainer" xmi:id="_ubJcwKeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_ubJcwaeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.ProtocolContainerEditHelperAdvice" xmi:id="_5m7RcOc2EeSW0_lDigZ13g" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration xmi:id="_ubJcwqeUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.RTRExcludedElement" name="RTRExcludedElement" xmi:id="_ubJcw6eUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableElement.gif" xmi:id="_ubJcxKeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableElement</specializedTypesID>

+    <matcherConfiguration xmi:id="_ubJcxaeUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTRExcludedElement</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.RTMessageSet" name="RTMessageSet" xmi:id="_ubJcxqeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_ubJcx6eUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+    <editHelperAdviceConfiguration description="Edit helper advice on " editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.MessageSetEditHelperAdvice" xmi:id="_1caKcOUVEeSW0_lDigZ13g" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration xmi:id="_ubJcyKeUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.ProtocolMessage" name="ProtocolMessage" xmi:id="_At0JAONwEeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_At0JAeNwEeSMDu6IBsn9eg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+    <editHelperAdviceConfiguration description="advice for Operation" editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageEditHelperAdvice" xmi:id="_At0JAuNwEeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageMatcher" xmi:id="_OPE2wOqQEeS-F5lSZrhlvg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn" name="ProtocolMessageIN" xmi:id="_1puuMOToEeSW0_lDigZ13g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_7aYeMOToEeSW0_lDigZ13g"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>

+    <editHelperAdviceConfiguration description="advice for Operation as Message IN" editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice" xmi:id="_7aZFQOToEeSW0_lDigZ13g" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageInMatcher" xmi:id="_PLPkEOqQEeS-F5lSZrhlvg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut" name="ProtocolMessageOUT" xmi:id="_Vv9-gOzDEeSbg9FMiG2BVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Vv9-gezDEeSbg9FMiG2BVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>

+    <editHelperAdviceConfiguration description="advice for Operation as RTMessage OUT" editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageOutEditHelperAdvice" xmi:id="_Vv9-guzDEeSbg9FMiG2BVg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageOutMatcher" xmi:id="_Vv9-g-zDEeSbg9FMiG2BVg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut" name="ProtocolMessageINOUT" xmi:id="_WBNfgOzDEeSbg9FMiG2BVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_WBNfgezDEeSbg9FMiG2BVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>

+    <editHelperAdviceConfiguration description="advice for Operation as Message INOUT" editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInOutEditHelperAdvice" xmi:id="_WBNfguzDEeSbg9FMiG2BVg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.umlrt.custom.advice.RTMessageInOutMatcher" xmi:id="_WBNfg-zDEeSbg9FMiG2BVg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.capsule" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::Capsule" updateName="true" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.capsulePart" target="_ubJctKeUEeSUR5jX0TaAcA" xmi:id="_ubJcy6eUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::CapsulePart" updateName="true" xmi:id="_ubJczKeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.protocol" target="_ubJct6eUEeSUR5jX0TaAcA" xmi:id="_ubJczaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::Protocol" updateName="true" xmi:id="_ubJczqeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.rTPort" target="_ubJcuqeUEeSUR5jX0TaAcA" xmi:id="_ubJcz6eUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::RTPort" updateName="true" xmi:id="_ubJc0KeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.rTConnector" target="_ubJcvaeUEeSUR5jX0TaAcA" xmi:id="_ubJc0aeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::RTConnector" updateName="true" xmi:id="_ubJc0qeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.protocolContainer" target="_ubJcwKeUEeSUR5jX0TaAcA" xmi:id="_ubJc06eUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::ProtocolContainer" updateName="true" xmi:id="_ubJc1KeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.rTRExcludedElement" target="_ubJcw6eUEeSUR5jX0TaAcA" xmi:id="_ubJc1aeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::RTRExcludedElement" updateName="true" xmi:id="_ubJc1qeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.umlrt.rTMessageSet" target="_ubJcxqeUEeSUR5jX0TaAcA" xmi:id="_ubJc16eUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="UMLRealTime::RTMessageSet" updateName="true" xmi:id="_ubJc2KeUEeSUR5jX0TaAcA">

+      <requiredProfiles>UMLRealTime</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice" identifier="org.eclipse.papyrus.umlrt.custom.advice.BehavioredClassifierEditHelperAdvice" inheritance="all" xmi:id="_Mb9lIOc0EeSW0_lDigZ13g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScaNtlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice" identifier="org.eclipse.papyrus.umlrt.custom.advice.OperationEditHelperAdvice" inheritance="all" xmi:id="_72t-8AXkEeW5T4E9mdKXVA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc8ZVFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
index 3da949286d7..6fc43c5814d 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations
@@ -1,714 +1,314 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
-    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
-    xmi:id="_sHw4IMQMEeS2vZeHP4gaVg"
-    name="UMLRealTime"
-    identifier="org.eclipse.papyrus.umlrt.elementTypes"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHw4IcQMEeS2vZeHP4gaVg"
-      name="Capsule (2008)"
-      identifier="org.eclipse.papyrus.umlrt.Capsule_2008"
-      hint="2008">
-    <iconEntry
-        xmi:id="_sHw4IsQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGQMQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGQcQMEeS2vZeHP4gaVg"
-      name="Capsule (3004)"
-      identifier="org.eclipse.papyrus.umlrt.Capsule_3004"
-      hint="3004">
-    <iconEntry
-        xmi:id="_sHyGQsQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGRMQMEeS2vZeHP4gaVg"
-      name="Capsule (3008)"
-      identifier="org.eclipse.papyrus.umlrt.Capsule_3008"
-      hint="3008">
-    <iconEntry
-        xmi:id="_sHyGRcQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGRsQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGR8QMEeS2vZeHP4gaVg"
-      name="Capsule (3010)"
-      identifier="org.eclipse.papyrus.umlrt.Capsule_3010"
-      hint="3010">
-    <iconEntry
-        xmi:id="_sHyGSMQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGScQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGSsQMEeS2vZeHP4gaVg"
-      name="Capsule (3014)"
-      identifier="org.eclipse.papyrus.umlrt.Capsule_3014"
-      hint="3014">
-    <iconEntry
-        xmi:id="_sHyGS8QMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGTMQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGTcQMEeS2vZeHP4gaVg"
-      name="CapsulePart (3002)"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3002"
-      hint="3002">
-    <iconEntry
-        xmi:id="_sHyGTsQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3002</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGT8QMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGUMQMEeS2vZeHP4gaVg"
-      name="CapsulePart (3005)"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3005"
-      hint="3005">
-    <iconEntry
-        xmi:id="_sHyGUcQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3005</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGUsQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGU8QMEeS2vZeHP4gaVg"
-      name="CapsulePart (3006)"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3006"
-      hint="3006">
-    <iconEntry
-        xmi:id="_sHyGVMQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3006</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGVcQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGVsQMEeS2vZeHP4gaVg"
-      name="CapsulePart (3012)"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3012"
-      hint="3012">
-    <iconEntry
-        xmi:id="_sHyGV8QMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3012</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGWMQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGWcQMEeS2vZeHP4gaVg"
-      name="CapsulePart (3018)"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3018"
-      hint="3018">
-    <iconEntry
-        xmi:id="_sHyGWsQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3018</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGW8QMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHyGXMQMEeS2vZeHP4gaVg"
-      name="CapsulePart (3041)"
-      identifier="org.eclipse.papyrus.umlrt.CapsulePart_3041"
-      hint="3041">
-    <iconEntry
-        xmi:id="_sHyGXcQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3041</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHyGXsQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_emBOIMlhEeSwZ7pccGhSNg"
-      name="Protocol (2008)"
-      identifier="org.eclipse.papyrus.umlrt.Protocol_2008"
-      hint="2008">
-    <iconEntry
-        xmi:id="_emBOIclhEeSwZ7pccGhSNg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_emBOIslhEeSwZ7pccGhSNg">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_emBOI8lhEeSwZ7pccGhSNg"
-      name="Protocol (3004)"
-      identifier="org.eclipse.papyrus.umlrt.Protocol_3004"
-      hint="3004">
-    <iconEntry
-        xmi:id="_emBOJMlhEeSwZ7pccGhSNg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_emBOJclhEeSwZ7pccGhSNg">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_emBOJslhEeSwZ7pccGhSNg"
-      name="Protocol (3008)"
-      identifier="org.eclipse.papyrus.umlrt.Protocol_3008"
-      hint="3008">
-    <iconEntry
-        xmi:id="_emBOJ8lhEeSwZ7pccGhSNg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_emBOKMlhEeSwZ7pccGhSNg">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_emBOKclhEeSwZ7pccGhSNg"
-      name="Protocol (3010)"
-      identifier="org.eclipse.papyrus.umlrt.Protocol_3010"
-      hint="3010">
-    <iconEntry
-        xmi:id="_emBOKslhEeSwZ7pccGhSNg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_emBOK8lhEeSwZ7pccGhSNg">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_emBOLMlhEeSwZ7pccGhSNg"
-      name="Protocol (3014)"
-      identifier="org.eclipse.papyrus.umlrt.Protocol_3014"
-      hint="3014">
-    <iconEntry
-        xmi:id="_emBOLclhEeSwZ7pccGhSNg"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_emBOLslhEeSwZ7pccGhSNg">
-      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytUMQMEeS2vZeHP4gaVg"
-      name="ProtocolContainer (2007)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_2007"
-      hint="2007">
-    <iconEntry
-        xmi:id="_sHytUcQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Package.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_2007</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytUsQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytU8QMEeS2vZeHP4gaVg"
-      name="ProtocolContainer (3009)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_3009"
-      hint="3009">
-    <iconEntry
-        xmi:id="_sHytVMQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Package.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_3009</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytVcQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytVsQMEeS2vZeHP4gaVg"
-      name="ProtocolContainer (PapyrusUMLClassDiagram)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram"
-      hint="PapyrusUMLClassDiagram">
-    <iconEntry
-        xmi:id="_sHytV8QMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Package.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_1000</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytWMQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytWcQMEeS2vZeHP4gaVg"
-      name="RTMessageSet (2004)"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_2004"
-      hint="2004">
-    <iconEntry
-        xmi:id="_sHytWsQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Interface.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_2004</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytW8QMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytXMQMEeS2vZeHP4gaVg"
-      name="RTMessageSet (3023)"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3023"
-      hint="3023">
-    <iconEntry
-        xmi:id="_sHytXcQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Interface.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3023</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytXsQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytX8QMEeS2vZeHP4gaVg"
-      name="RTMessageSet (3036)"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3036"
-      hint="3036">
-    <iconEntry
-        xmi:id="_sHytYMQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Interface.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3036</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytYcQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytYsQMEeS2vZeHP4gaVg"
-      name="RTMessageSet (3037)"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3037"
-      hint="3037">
-    <iconEntry
-        xmi:id="_sHytY8QMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Interface.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3037</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytZMQMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sHytZcQMEeS2vZeHP4gaVg"
-      name="RTMessageSet (3038)"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3038"
-      hint="3038">
-    <iconEntry
-        xmi:id="_sHytZsQMEeS2vZeHP4gaVg"
-        iconPath="/icons/full/obj16/Interface.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3038</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sHytZ8QMEeS2vZeHP4gaVg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_UKFswON2EeSMDu6IBsn9eg"
-      name="Operation (3003)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3003"
-      hint="3003">
-    <iconEntry
-        xmi:id="_UKFsweN2EeSMDu6IBsn9eg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_UKFswuN2EeSMDu6IBsn9eg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_iggYsON2EeSMDu6IBsn9eg"
-      name="Operation (3007)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3007"
-      hint="3007">
-    <iconEntry
-        xmi:id="_iggYseN2EeSMDu6IBsn9eg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_iggYsuN2EeSMDu6IBsn9eg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_nR6SMON2EeSMDu6IBsn9eg"
-      name="Operation (3013)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3013"
-      hint="3013">
-    <iconEntry
-        xmi:id="_nR6SMeN2EeSMDu6IBsn9eg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_nR6SMuN2EeSMDu6IBsn9eg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_sqMlgON2EeSMDu6IBsn9eg"
-      name="Operation (3019)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3019"
-      hint="3019">
-    <iconEntry
-        xmi:id="_sqMlgeN2EeSMDu6IBsn9eg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_sqMlguN2EeSMDu6IBsn9eg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_xQYGcON2EeSMDu6IBsn9eg"
-      name="Operation (3042)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3042"
-      hint="3042">
-    <iconEntry
-        xmi:id="_xQYGceN2EeSMDu6IBsn9eg"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_xQYGcuN2EeSMDu6IBsn9eg">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_59GfoPlnEeSacPCZ52E8kQ"
-      name="Operation (3003)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3003"
-      hint="3003">
-    <iconEntry
-        xmi:id="_59GfoflnEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_59GfovlnEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_59Gfo_lnEeSacPCZ52E8kQ"
-      name="Operation (3007)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3007"
-      hint="3007">
-    <iconEntry
-        xmi:id="_59GfpPlnEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_59GfpflnEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_59GfpvlnEeSacPCZ52E8kQ"
-      name="Operation (3013)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3013"
-      hint="3013">
-    <iconEntry
-        xmi:id="_59Gfp_lnEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_59GfqPlnEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_59GfqflnEeSacPCZ52E8kQ"
-      name="Operation (3019)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3019"
-      hint="3019">
-    <iconEntry
-        xmi:id="_59GfqvlnEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_59Gfq_lnEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_59GfrPlnEeSacPCZ52E8kQ"
-      name="Operation (3042)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3042"
-      hint="3042">
-    <iconEntry
-        xmi:id="_59GfrflnEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_59GfrvlnEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_Kpj14PloEeSacPCZ52E8kQ"
-      name="Operation (3003)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3003"
-      hint="3003">
-    <iconEntry
-        xmi:id="_Kpj14floEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_Kpj14vloEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_Kpj14_loEeSacPCZ52E8kQ"
-      name="Operation (3007)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3007"
-      hint="3007">
-    <iconEntry
-        xmi:id="_Kpj15PloEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_Kpj15floEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_Kpj15vloEeSacPCZ52E8kQ"
-      name="Operation (3013)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3013"
-      hint="3013">
-    <iconEntry
-        xmi:id="_Kpj15_loEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_Kpj16PloEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_Kpj16floEeSacPCZ52E8kQ"
-      name="Operation (3019)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3019"
-      hint="3019">
-    <iconEntry
-        xmi:id="_Kpj16vloEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_Kpj16_loEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_Kpj17PloEeSacPCZ52E8kQ"
-      name="Operation (3042)"
-      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3042"
-      hint="3042">
-    <iconEntry
-        xmi:id="_Kpj17floEeSacPCZ52E8kQ"
-        iconPath="/icons/full/obj16/Operation.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_Kpj17vloEeSacPCZ52E8kQ">
-      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/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.umlrt.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLRealTime" xmi:id="_sHw4IMQMEeS2vZeHP4gaVg" xmi:version="2.0">

+  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.umlrt.Capsule_2008" name="Capsule (2008)" xmi:id="_sHw4IcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHw4IsQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGQMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.umlrt.Capsule_3004" name="Capsule (3004)" xmi:id="_sHyGQcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGQsQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGQ8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.umlrt.Capsule_3008" name="Capsule (3008)" xmi:id="_sHyGRMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGRcQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGRsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.umlrt.Capsule_3010" name="Capsule (3010)" xmi:id="_sHyGR8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGSMQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGScQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.umlrt.Capsule_3014" name="Capsule (3014)" xmi:id="_sHyGSsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_sHyGS8QMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Capsule</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGTMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Capsule</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.umlrt.CapsulePart_3002" name="CapsulePart (3002)" xmi:id="_sHyGTcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGTsQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3002</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGT8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3005" identifier="org.eclipse.papyrus.umlrt.CapsulePart_3005" name="CapsulePart (3005)" xmi:id="_sHyGUMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGUcQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3005</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGUsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.umlrt.CapsulePart_3006" name="CapsulePart (3006)" xmi:id="_sHyGU8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGVMQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3006</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGVcQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.umlrt.CapsulePart_3012" name="CapsulePart (3012)" xmi:id="_sHyGVsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGV8QMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3012</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGWMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.umlrt.CapsulePart_3018" name="CapsulePart (3018)" xmi:id="_sHyGWcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGWsQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3018</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGW8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.umlrt.CapsulePart_3041" name="CapsulePart (3041)" xmi:id="_sHyGXMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_sHyGXcQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.CapsulePart</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3041</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHyGXsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::CapsulePart</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.umlrt.Protocol_2008" name="Protocol (2008)" xmi:id="_emBOIMlhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOIclhEeSwZ7pccGhSNg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>

+    <matcherConfiguration xmi:id="_emBOIslhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.umlrt.Protocol_3004" name="Protocol (3004)" xmi:id="_emBOI8lhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOJMlhEeSwZ7pccGhSNg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>

+    <matcherConfiguration xmi:id="_emBOJclhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.umlrt.Protocol_3008" name="Protocol (3008)" xmi:id="_emBOJslhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOJ8lhEeSwZ7pccGhSNg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>

+    <matcherConfiguration xmi:id="_emBOKMlhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.umlrt.Protocol_3010" name="Protocol (3010)" xmi:id="_emBOKclhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOKslhEeSwZ7pccGhSNg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>

+    <matcherConfiguration xmi:id="_emBOK8lhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.umlrt.Protocol_3014" name="Protocol (3014)" xmi:id="_emBOLMlhEeSwZ7pccGhSNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_emBOLclhEeSwZ7pccGhSNg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.Protocol</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>

+    <matcherConfiguration xmi:id="_emBOLslhEeSwZ7pccGhSNg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::Protocol</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2007" identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_2007" name="ProtocolContainer (2007)" xmi:id="_sHytUMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_sHytUcQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_2007</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytUsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3009" identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_3009" name="ProtocolContainer (3009)" xmi:id="_sHytU8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_sHytVMQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_3009</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytVcQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLClassDiagram" identifier="org.eclipse.papyrus.umlrt.ProtocolContainer_PapyrusUMLClassDiagram" name="ProtocolContainer (PapyrusUMLClassDiagram)" xmi:id="_sHytVsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_sHytV8QMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolContainer</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Package_1000</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytWMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::ProtocolContainer</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2004" identifier="org.eclipse.papyrus.umlrt.RTMessageSet_2004" name="RTMessageSet (2004)" xmi:id="_sHytWcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytWsQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_2004</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytW8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3023" name="RTMessageSet (3023)" xmi:id="_sHytXMQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytXcQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3023</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytXsQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3036" identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3036" name="RTMessageSet (3036)" xmi:id="_sHytX8QMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytYMQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3036</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytYcQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3037" identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3037" name="RTMessageSet (3037)" xmi:id="_sHytYsQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytY8QMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3037</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytZMQMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.umlrt.RTMessageSet_3038" name="RTMessageSet (3038)" xmi:id="_sHytZcQMEeS2vZeHP4gaVg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_sHytZsQMEeS2vZeHP4gaVg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessageSet</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Interface_3038</specializedTypesID>

+    <matcherConfiguration xmi:id="_sHytZ8QMEeS2vZeHP4gaVg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3003" name="Operation (3003)" xmi:id="_UKFswON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_UKFsweN2EeSMDu6IBsn9eg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>

+    <matcherConfiguration xmi:id="_UKFswuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3007" name="Operation (3007)" xmi:id="_iggYsON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_iggYseN2EeSMDu6IBsn9eg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>

+    <matcherConfiguration xmi:id="_iggYsuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3013" name="Operation (3013)" xmi:id="_nR6SMON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_nR6SMeN2EeSMDu6IBsn9eg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>

+    <matcherConfiguration xmi:id="_nR6SMuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3019" name="Operation (3019)" xmi:id="_sqMlgON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_sqMlgeN2EeSMDu6IBsn9eg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>

+    <matcherConfiguration xmi:id="_sqMlguN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn_3042" name="Operation (3042)" xmi:id="_xQYGcON2EeSMDu6IBsn9eg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_xQYGceN2EeSMDu6IBsn9eg"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageIn</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>

+    <matcherConfiguration xmi:id="_xQYGcuN2EeSMDu6IBsn9eg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3003" name="Operation (3003)" xmi:id="_59GfoPlnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfoflnEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>

+    <matcherConfiguration xmi:id="_59GfovlnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3007" name="Operation (3007)" xmi:id="_59Gfo_lnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfpPlnEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>

+    <matcherConfiguration xmi:id="_59GfpflnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3013" name="Operation (3013)" xmi:id="_59GfpvlnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59Gfp_lnEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>

+    <matcherConfiguration xmi:id="_59GfqPlnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3019" name="Operation (3019)" xmi:id="_59GfqflnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfqvlnEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>

+    <matcherConfiguration xmi:id="_59Gfq_lnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut_3042" name="Operation (3042)" xmi:id="_59GfrPlnEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_59GfrflnEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageInOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>

+    <matcherConfiguration xmi:id="_59GfrvlnEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3003" name="Operation (3003)" xmi:id="_Kpj14PloEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj14floEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3003</specializedTypesID>

+    <matcherConfiguration xmi:id="_Kpj14vloEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3007" name="Operation (3007)" xmi:id="_Kpj14_loEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj15PloEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3007</specializedTypesID>

+    <matcherConfiguration xmi:id="_Kpj15floEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3013" name="Operation (3013)" xmi:id="_Kpj15vloEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj15_loEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3013</specializedTypesID>

+    <matcherConfiguration xmi:id="_Kpj16PloEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3019" name="Operation (3019)" xmi:id="_Kpj16floEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj16vloEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3019</specializedTypesID>

+    <matcherConfiguration xmi:id="_Kpj16_loEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut_3042" name="Operation (3042)" xmi:id="_Kpj17PloEeSacPCZ52E8kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Kpj17floEeSacPCZ52E8kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessageOut</specializedTypesID>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Operation_3042</specializedTypesID>

+    <matcherConfiguration xmi:id="_Kpj17vloEeSacPCZ52E8kQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>UMLRealTime::RTMessageSet</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
index 0cbe3e07df6..76dfd6bea5d 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/plugin.xml
@@ -54,16 +54,16 @@
       </profile>
    </extension>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.umlrt.elementTypeSet"
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="elementtypes/uml-rt.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
-            id="org.eclipse.papyrus.umlrt.elementTypeSet2"
+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="elementtypes/uml-rt.umlclassdiagram.elementtypesconfigurations">
       </elementTypeSet>
    </extension>
diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
index 3293775418b..6b5967ed2f4 100644
--- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
+++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml
@@ -225,7 +225,7 @@ http://www.eclipse.org/legal/epl-v10.html
          unpack="false"/>
          
    <plugin
-         id="org.eclipse.papyrus.elementtypesconfigurations.developer"
+         id="org.eclipse.papyrus.dev.types"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
index 84d1fd337c7..660c76d091a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.emf.feature/feature.xml
@@ -20,6 +20,10 @@ http://www.eclipse.org/legal/epl-v10.html
    <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.appearance" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.readonly" install-size="0" unpack="false" version="0.0.0"/>
+   
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.types" install-size="0" unpack="false" version="0.0.0"/>
+   
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.types.ui" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.gmf" install-size="0" unpack="false" version="0.0.0"/>
 
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
index 6ce8d08a1ee..4efee20e7c3 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
@@ -41,17 +41,13 @@ http://www.eclipse.org/legal/epl-v10.html
 	
 	<plugin download-size="0" id="org.eclipse.papyrus.infra.sync" install-size="0" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.edit" install-size="0" unpack="false" version="0.0.0"/>
-
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types" install-size="0" unpack="false" version="0.0.0"/>
    
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.core" install-size="0" unpack="false" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes" install-size="0" unpack="false" version="0.0.0"/>
-   
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.edit" install-size="0" unpack="false" version="0.0.0"/>
+
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.rulebased" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.filters" install-size="0" unpack="false" version="0.0.0"/>
 
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
index d809562187d..d71c88771f9 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
@@ -23,7 +23,7 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.ui" install-size="0" unpack="false" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.ui" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.extendedtypes.ui" install-size="0" unpack="false" version="0.0.0"/>
 
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml
index 18d9aa2f92e..cae7df46d7f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.assistants.feature/feature.xml
@@ -17,8 +17,8 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.assistants.generator.ui" install-size="0" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator" install-size="0" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.types.generator" install-size="0" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.types.generator.ui" install-size="0" unpack="false" version="0.0.0"/>
 
 </feature>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
index 0e584197575..6b2b498b058 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.feature/feature.xml
@@ -55,6 +55,6 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin download-size="0" id="org.eclipse.papyrus.uml.filters.edit" install-size="0" unpack="false" version="0.0.0"/>
    
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.elementtypesconfigurations" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.uml.types.core" install-size="0" unpack="false" version="0.0.0"/>
 
 </feature>
\ No newline at end of file
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml
index caf65622753..6fadcb604f4 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml
@@ -18,9 +18,9 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin download-size="0" id="org.eclipse.papyrus.infra.extendedtypes.ui.tests" install-size="0" unpack="false" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.tests" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.tests" install-size="0" unpack="false" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.infra.types.ui.tests" install-size="0" unpack="false" version="0.0.0"/>
 
    <plugin download-size="0" fragment="true" id="org.eclipse.papyrus.infra.gmfdiag.commands.tests" install-size="0" unpack="false" version="0.0.0"/>
 
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature/feature.xml
index e48c0d0b29c..48c7fca1c86 100644
--- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature/feature.xml
+++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.uml.assistants.feature/feature.xml
@@ -51,6 +51,6 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
 
    <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.assistants.generator.tests" install-size="0" unpack="false" version="0.0.0"/>
 
-   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests" install-size="0" unpack="false" version="0.0.0"/>
+   <plugin download-size="0" id="org.eclipse.papyrus.uml.profile.types.generator.tests" install-size="0" unpack="false" version="0.0.0"/>
 
 </feature>
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
index ff8ae8721fa..bc0d0de5aa9 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.uml2.uml;bundle-version="5.0.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

  com.google.guava;bundle-version="11.0.0",

@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.10.100",

  org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

  org.eclipse.gmf.codegen;bundle-version="2.11.0"

diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
index d9124801efd..268b2176800 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypeToAssistantRule.xtend
@@ -14,12 +14,12 @@
 package org.eclipse.papyrus.dev.assistants.codegen.generator
 
 import javax.inject.Inject
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration
 import org.eclipse.papyrus.infra.filters.Filter
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.uml.profile.assistants.generator.FiltersUtil
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
 
 /**
  * Element Type to Assistant transformation rule.
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
index 84e8b3bbde5..71c6a104385 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ElementTypesToAssistantsGenerator.java
@@ -13,10 +13,10 @@
 
 package org.eclipse.papyrus.dev.assistants.codegen.generator;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.AbstractGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.uml.profile.types.generator.AbstractGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
 
 import com.google.inject.Inject;
 
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
index dc39ffd8019..588d759be45 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GMFGenToAssistantsGenerator.java
@@ -15,8 +15,8 @@ package org.eclipse.papyrus.dev.assistants.codegen.generator;
 
 import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.AbstractGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.AbstractGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
 
 import com.google.inject.Inject;
 
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java
index 2ea20dcdd64..581c9db6fd8 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/GeneratorModule.java
@@ -14,10 +14,10 @@
 package org.eclipse.papyrus.dev.assistants.codegen.generator;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.papyrus.uml.profile.assistants.generator.ModelingAssistantProviderRule;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.InputModel;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.InputModel;
 
 /**
  * The Guice injector module for the Element Types to Modeling Assistants transformation.
@@ -44,7 +44,7 @@ public class GeneratorModule extends org.eclipse.papyrus.uml.profile.assistants.
 
 	@Override
 	protected void bindInputType() {
-		bind(EClass.class).annotatedWith(InputModel.class).toInstance(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
+		bind(EClass.class).annotatedWith(InputModel.class).toInstance(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
 	}
 
 	@Override
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
index bbe49c3b7cc..71d49e0dc6f 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/generator/ModelingAssistantProviderRule.xtend
@@ -16,8 +16,8 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration
 import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator
 
 /**
diff --git a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java
index 7b83a220c83..e21fe366766 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.assistants.codegen/src/org/eclipse/papyrus/dev/assistants/codegen/internal/handlers/GenerateModelingAssistantsFromElementTypesHandler.java
@@ -26,10 +26,10 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.dev.assistants.codegen.generator.ElementTypesToAssistantsGenerator;
 import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.util.AssistantResource;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.statushandlers.StatusManager;
 
@@ -52,7 +52,7 @@ public class GenerateModelingAssistantsFromElementTypesHandler extends AbstractH
 				final ResourceSet rset = new ResourceSetImpl();
 				try {
 					Resource resource = rset.getResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true), true);
-					Object input = EcoreUtil.getObjectByType(resource.getContents(), ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
+					Object input = EcoreUtil.getObjectByType(resource.getContents(), ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
 					if (input instanceof ElementTypeSetConfiguration) {
 						ElementTypeSetConfiguration elementTypeSet = (ElementTypeSetConfiguration) input;
 
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.classpath b/plugins/developer/org.eclipse.papyrus.dev.types/.classpath
index 7bcdff09eb7..7bcdff09eb7 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.classpath
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/.classpath
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.project b/plugins/developer/org.eclipse.papyrus.dev.types/.project
index 2a8e03b2e1f..0dee8f27fe2 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.project
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.elementtypesconfigurations.developer</name>

+	<name>org.eclipse.papyrus.dev.types</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..9ca8e68231b 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
index 26c0911395e..3a5c8f951a2 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
@@ -1,27 +1,27 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="5.0.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.emf.codegen.ecore;bundle-version="2.10.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.gmf.codegen;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.xtext.xbase.lib,
- org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro,
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.core.filesystem;bundle-version="1.6.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.elementtypesconfigurations.developer.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.elementtypesconfigurations.developer;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.ui,

+ org.eclipse.core.runtime,

+ org.eclipse.uml2.uml;bundle-version="5.0.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

+ org.eclipse.emf.codegen.ecore;bundle-version="2.10.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

+ org.eclipse.gmf.codegen;bundle-version="2.11.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ com.google.guava;bundle-version="11.0.0",

+ org.eclipse.xtext.xbase.lib,

+ org.eclipse.xtend.lib,

+ org.eclipse.xtend.lib.macro,

+ org.eclipse.ui.workbench,

+ org.eclipse.ui.ide;bundle-version="3.10.100",

+ org.eclipse.core.filesystem;bundle-version="1.6.0"

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.dev.types.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.dev.types;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/about.html b/plugins/developer/org.eclipse.papyrus.dev.types/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/about.html
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/about.html
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/build.properties b/plugins/developer/org.eclipse.papyrus.dev.types/build.properties
index 5f460d66db9..5f460d66db9 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/build.properties
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/icons/sample.gif b/plugins/developer/org.eclipse.papyrus.dev.types/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/icons/sample.gif
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/icons/sample.gif
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/plugin.properties b/plugins/developer/org.eclipse.papyrus.dev.types/plugin.properties
index 31d4842c2ca..2cd3688a3b7 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/plugin.properties
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:

 #     CEA LIST - initial API and implementation

 ###############################################################################

-pluginName=Papyrus ElementTypesConfigurations framework for developers plugin

+pluginName=Papyrus TypesConfigurations framework for developers plugin

 providerName=Eclipse Modeling Project

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/plugin.xml b/plugins/developer/org.eclipse.papyrus.dev.types/plugin.xml
index 6acc490b601..a591e0bb35c 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/plugin.xml
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/plugin.xml
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-
-
-
-	<extension
-         point="org.eclipse.ui.menus">
-    <menuContribution
-          allPopups="false"
-          locationURI="popup:org.eclipse.ui.popup.any">
-       <command
-             commandId="org.eclipse.papyrus.infra.elementtypesconfigurations.commands.migrateElementTypesConfigurations"
-             id="org.eclipse.papyrus.infra.elementtypesconfigurations.menus.migrateElementTypesConfigurations"
-             label="Migrate ElementTypes Configurations"
-             mnemonic="S"
-             style="push">
-          <visibleWhen
-                checkEnabled="false">
-                <with
-                   variable="selection">
-                <iterate
-                      ifEmpty="false"
-                      operator="and">
-                   <adapt
-                         type="org.eclipse.core.resources.IFile">
-                   </adapt>
-                </iterate>
-             </with>
-          </visibleWhen>
-       </command>
-    </menuContribution>
-    <menuContribution
-          allPopups="false"
-          locationURI="popup:org.eclipse.ui.popup.any">
-       <command
-             commandId="org.eclipse.papyrus.infra.elementtypesconfigurations.commands.generateElementTypesRegistry"
-             id="org.eclipse.papyrus.infra.elementtypesconfigurations.menus.generateElementTypesRegistry"
-             label="Generate ElementTypes Registry"
-             mnemonic="G"
-             style="push">
-          <visibleWhen
-                checkEnabled="false">
-                <with
-                   variable="selection">
-                <iterate
-                      ifEmpty="false"
-                      operator="and">
-                   <adapt
-                         type="org.eclipse.core.resources.IFile">
-                   </adapt>
-                </iterate>
-             </with>
-          </visibleWhen>
-       </command>
-    </menuContribution>
-	</extension>
-
-	<extension
-         point="org.eclipse.ui.commands">
-  <command
-        defaultHandler="org.eclipse.papyrus.elementtypesconfigurations.developer.handlers.MigrateElementTypesConfigurations"
-        id="org.eclipse.papyrus.infra.elementtypesconfigurations.commands.migrateElementTypesConfigurations"
-        name="Migrate ElementTypesConfigurations">
-  </command>
-      <command
-        defaultHandler="org.eclipse.papyrus.elementtypesconfigurations.developer.handlers.GenerateElementTypesRegistry"
-        id="org.eclipse.papyrus.infra.elementtypesconfigurations.commands.generateElementTypesRegistry"
-        name="Generate ElementTypes Registry">
-  </command>
-	</extension>
- <extension
-       point="org.eclipse.ui.views">
-    <view
-          category="org.eclipse.papyrus.views.category"
-          class="org.eclipse.papyrus.elementtypesconfigurations.developer.view.RegistredElementTypesView"
-          id="org.eclipse.papyrus.elementtypesconfigurations.developer.registeredElementTypesView"
-          name="Registred ElementTypes View"
-          restorable="true">
-    </view>
- </extension>
- 
-  <extension
-       point="org.eclipse.ui.views">
-    <view
-          category="org.eclipse.papyrus.views.category"
-          class="org.eclipse.papyrus.elementtypesconfigurations.developer.view.ElementTypesConfigurationsListenerView"
-          id="org.eclipse.papyrus.elementtypesconfigurations.developer.elementTypesConfigurationsListenerView"
-          name="ElementTypesConfigurations Listener View"
-          restorable="true">
-    </view>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+

+

+

+

+	<extension

+         point="org.eclipse.ui.menus">

+    <menuContribution

+          allPopups="false"

+          locationURI="popup:org.eclipse.ui.popup.any">

+       <command

+             commandId="org.eclipse.papyrus.infra.dev.types.commands.migrateTypesConfigurations"

+             id="org.eclipse.papyrus.infra.dev.types.menus.migrateTypesConfigurations"

+             label="Migrate ElementTypes Configurations"

+             mnemonic="S"

+             style="push">

+          <visibleWhen

+                checkEnabled="false">

+                <with

+                   variable="selection">

+                <iterate

+                      ifEmpty="false"

+                      operator="and">

+                   <adapt

+                         type="org.eclipse.core.resources.IFile">

+                   </adapt>

+                </iterate>

+             </with>

+          </visibleWhen>

+       </command>

+    </menuContribution>

+    <menuContribution

+          allPopups="false"

+          locationURI="popup:org.eclipse.ui.popup.any">

+       <command

+             commandId="org.eclipse.papyrus.infra.dev.types.commands.generateElementTypesRegistry"

+             id="org.eclipse.papyrus.infra.dev.types.menus.generateElementTypesRegistry"

+             label="Generate ElementTypes Registry"

+             mnemonic="G"

+             style="push">

+          <visibleWhen

+                checkEnabled="false">

+                <with

+                   variable="selection">

+                <iterate

+                      ifEmpty="false"

+                      operator="and">

+                   <adapt

+                         type="org.eclipse.core.resources.IFile">

+                   </adapt>

+                </iterate>

+             </with>

+          </visibleWhen>

+       </command>

+    </menuContribution>

+	</extension>

+

+	<extension

+         point="org.eclipse.ui.commands">

+  <command

+        defaultHandler="org.eclipse.papyrus.dev.types.handlers.MigrateTypesConfigurations"

+        id="org.eclipse.papyrus.infra.dev.types.commands.migrateTypesConfigurations"

+        name="Migrate TypesConfigurations">

+  </command>

+      <command

+        defaultHandler="org.eclipse.papyrus.dev.types.handlers.GenerateElementTypesRegistry"

+        id="org.eclipse.papyrus.infra.dev.types.commands.generateElementTypesRegistry"

+        name="Generate ElementTypes Registry">

+  </command>

+	</extension>

+ <extension

+       point="org.eclipse.ui.views">

+    <view

+          category="org.eclipse.papyrus.views.category"

+          class="org.eclipse.papyrus.dev.types.view.RegistredElementTypesView"

+          id="org.eclipse.papyrus.dev.types.registeredElementTypesView"

+          name="Registred ElementTypes View"

+          restorable="true">

+    </view>

+ </extension>

+ 

+  <extension

+       point="org.eclipse.ui.views">

+    <view

+          category="org.eclipse.papyrus.views.category"

+          class="org.eclipse.papyrus.dev.types.view.TypesConfigurationsListenerView"

+          id="org.eclipse.papyrus.dev.types.typesConfigurationsListenerView"

+          name="TypesConfigurations Listener View"

+          restorable="true">

+    </view>

+ </extension>

+

+</plugin>

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/pom.xml b/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml
index 0b4dee262a3..5a5bc064846 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/pom.xml
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.elementtypesconfigurations.developer</artifactId>
+	<artifactId>org.eclipse.papyrus.dev.types</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/Activator.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/Activator.java
index 8e6a1609ed6..be4d7b01a47 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/Activator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/Activator.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer;

+package org.eclipse.papyrus.dev.types;

 

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.elementtypesconfigurations.developer"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.dev.types"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.xtend b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/generator/ElementTypeRegistryGenerator.xtend
index 1314649fec7..8aa8eda55c6 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.xtend
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/generator/ElementTypeRegistryGenerator.xtend
@@ -1,9 +1,9 @@
-package org.eclipse.papyrus.elementtypesconfigurations.developer.generator

+package org.eclipse.papyrus.dev.types.generator

 

 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.common.util.TreeIterator

 import org.eclipse.emf.ecore.EObject

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration

+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration

 

 class ElementTypeRegistryGenerator {

 

@@ -46,15 +46,15 @@ class ElementTypeRegistryGenerator {
 	import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;

 	import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

 

-	public class «outputType» extends AbstractElementTypeEnumerator {

+	public class �outputType� extends AbstractElementTypeEnumerator {

 	

 		/** Constant for UML nature */

 		public static final String UML_NATURE = "UML_Nature";

 		

-		«FOR elementTypeConfiguration : allContentsIterable(it).filter(typeof(ElementTypeConfiguration))»

-		public static final IHintedType «safeName(elementTypeConfiguration.name).toUpperCase» = (IHintedType)getElementType("«elementTypeConfiguration.identifier»"); //$NON-NLS-1$

+		�FOR elementTypeConfiguration : allContentsIterable(it).filter(typeof(ElementTypeConfiguration))�

+		public static final IHintedType �safeName(elementTypeConfiguration.name).toUpperCase� = (IHintedType)getElementType("�elementTypeConfiguration.identifier�"); //$NON-NLS-1$

 		

-		«ENDFOR»

+		�ENDFOR�

 	

 	}

 	'''

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/handlers/GenerateElementTypesRegistry.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/GenerateElementTypesRegistry.java
index 65d08fde319..d355447296d 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/handlers/GenerateElementTypesRegistry.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/GenerateElementTypesRegistry.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.elementtypesconfigurations.developer.handlers;
+package org.eclipse.papyrus.dev.types.handlers;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.generator.ElementTypeRegistryGenerator;
+import org.eclipse.papyrus.dev.types.generator.ElementTypeRegistryGenerator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.dialogs.ContainerSelectionDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java
new file mode 100644
index 00000000000..0d39894b1bd
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/handlers/MigrateTypesConfigurations.java
@@ -0,0 +1,355 @@
+/*****************************************************************************
+ * Copyright (c) 2014 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.dev.types.handlers;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class MigrateTypesConfigurations extends AbstractHandler {
+	final String FILE_EXTENSION = "elementtypesconfigurations";
+
+	final String ELEMENTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:elementtypesconfigurations";
+	final String ELEMENTTYPECONFIGURATION_NAMESPACE_OLD = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0";
+	final String ELEMENTTYPECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1";
+
+	final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE = "applystereotypeadviceconfiguration";
+	final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACENEW = "applystereotypeadvice";
+	final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE;
+	final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACENEW;
+	final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1";
+
+	final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE = "invariantstereotyperuleconfiguration";
+	final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACENEW = "invariantstereotyperule";
+	final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE;
+	final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACENEW;
+	final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1";
+
+	final String SETTYPEADVICECONFIGURATION_NAMESPACE = "settypeadviceconfiguration";
+	final String SETTYPEADVICECONFIGURATION_NAMESPACENEW = "settypeadvice";
+	final String SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + SETTYPEADVICECONFIGURATION_NAMESPACE;
+	final String SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + SETTYPEADVICECONFIGURATION_NAMESPACENEW;
+	final String SETTYPEADVICECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/uml/types/settypeadvice/1.1";
+
+	final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE = "stereotypeapplicationmatcherconfiguration";
+	final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACENEW = "stereotypematcher";
+	final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE;
+	final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACENEW;
+	final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1";
+
+	final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE = "invariantcontainerruleconfiguration";
+	final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACENEW = "invariantcontainerrule";
+	final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE;
+	final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + INVARIANTCONTAINERRULECONFIGURATION_NAMESPACENEW;
+	final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1";
+
+	final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE = "runtimevalueseditionadviceconfiguration";
+	final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACENEW = "runtimevaluesadvice";
+	final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE;
+	final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACENEW;
+	final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1";
+
+	final String SETVALUESADVICECONFIGURATION_NAMESPACE = "setvaluesadviceconfiguration";
+	final String SETVALUESADVICECONFIGURATION_NAMESPACENEW = "setvaluesadvice";
+	final String SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + SETVALUESADVICECONFIGURATION_NAMESPACE;
+	final String SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + SETVALUESADVICECONFIGURATION_NAMESPACENEW;
+	final String SETVALUESADVICECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1";
+
+	final String INVARIANTTYPECONFIGURATION_NAMESPACE = "invarianttypeconfiguration";
+	final String INVARIANTTYPECONFIGURATION_NAMESPACENEW = "rulebased";
+	final String INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:" + INVARIANTTYPECONFIGURATION_NAMESPACE;
+	final String INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW = "xmlns:" + INVARIANTTYPECONFIGURATION_NAMESPACENEW;
+	final String INVARIANTTYPECONFIGURATION_NAMESPACE_NEW_URL = "http://www.eclipse.org/papyrus/infra/types/rulebased/1.1";
+
+	final String INVARIANTTYPECONFIGURATION = "InvariantTypeConfiguration";
+	final String INVARIANTTYPECONFIGURATION_NEW = "RuleBasedTypeConfiguration";
+
+	final String RUNTIMEVALUESEDITIONADVICECONFIGURATION = "RuntimeValuesEditionAdviceConfiguration";
+	final String RUNTIMEVALUESADVICECONFIGURATION = "RuntimeValuesAdviceConfiguration";
+
+	final String INHERITANCE_ATTRIBUTE = "inheritance";
+	final String TYPE_ATTRIBUTE = "xsi:type";
+	final String EDITHELPERADVICECONFIGURATION_TAG = "editHelperAdviceConfiguration";
+	final String MATCHERCONFIGURATION_TAG = "matcherConfiguration";
+	final String INVARIANTRULECONFIGURATION_TAG = "invariantRuleConfiguration";
+	final String RULECONFIGURATION_TAG = "ruleConfiguration";
+	final String NAME_ATTRIBUTE = "name";
+	final String IDENTIFIER_ATTRIBUTE = "identifier";
+	final String EDITHELPERADVICECLASSNAME_ATTRIBUTE = "editHelperAdviceClassName";
+	final String ADVICEBINDINGSCONFIGURATIONS_TAG = "adviceBindingsConfigurations";
+	final String MATCHER_TYPE = "elementtypesconfigurations:MatcherConfiguration";
+	final String ADVICEBINDINGCONFIGURATION_TYPE = "elementtypesconfigurations:AdviceBindingConfiguration";
+	final String EDITHELPERADVICECONFIGURATION_TYPE = "elementtypesconfigurations:EditHelperAdviceConfiguration";
+	final String MATCHERCLASSNAME_ATTRIBUTE = "matcherClassName";
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+
+
+
+		Map<String, String> mapMigration = new HashMap<>();
+
+		mapMigration.put(APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE, APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE, INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(SETTYPEADVICECONFIGURATION_NAMESPACE, SETTYPEADVICECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE, STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACENEW);
+		mapMigration.put(INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE, INVARIANTCONTAINERRULECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE, RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(SETVALUESADVICECONFIGURATION_NAMESPACE, SETVALUESADVICECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(INVARIANTTYPECONFIGURATION_NAMESPACE, INVARIANTTYPECONFIGURATION_NAMESPACENEW);
+		mapMigration.put(INVARIANTTYPECONFIGURATION, INVARIANTTYPECONFIGURATION_NEW);
+		mapMigration.put(RUNTIMEVALUESEDITIONADVICECONFIGURATION, RUNTIMEVALUESADVICECONFIGURATION);
+
+
+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
+			return null;
+		}
+
+		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
+
+		Iterator<?> it = selection.iterator();
+
+		while (it.hasNext()) {
+			Object selectedElement = (Object) it.next();
+
+			if (selectedElement instanceof IFile) {
+				if (FILE_EXTENSION.equals(((IFile) selectedElement).getFileExtension())) {
+					IFile selectedFile = ((IFile) selectedElement);
+					URI uri = selectedFile.getLocationURI();
+
+					if (selectedFile.isLinked()) {
+						uri = selectedFile.getRawLocationURI();
+					}
+
+					try {
+						File file = EFS.getStore(uri).toLocalFile(0, new NullProgressMonitor());
+						DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+						DocumentBuilder builder = factory.newDocumentBuilder();
+						Document doc = builder.parse(file);
+						Element root = doc.getDocumentElement();
+
+
+
+						// Update namespaces
+						root.setAttribute(ELEMENTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE, ELEMENTTYPECONFIGURATION_NAMESPACE_NEW);
+
+						if (!root.getAttribute(APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, SETTYPEADVICECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, SETVALUESADVICECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						if (!root.getAttribute(INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
+							root.removeAttribute(INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE);
+							root.setAttribute(INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE_NEW, INVARIANTTYPECONFIGURATION_NAMESPACE_NEW_URL);
+						}
+
+						NodeList editHelperAdviceConfigurations = root.getElementsByTagName(EDITHELPERADVICECONFIGURATION_TAG);
+
+
+						for (int i = 0; i < editHelperAdviceConfigurations.getLength(); i++) {
+							Element editHelperAdvice = (Element) editHelperAdviceConfigurations.item(i);
+
+							Node type = editHelperAdvice.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
+
+							if (type == null) {
+								editHelperAdvice.setAttribute(TYPE_ATTRIBUTE, EDITHELPERADVICECONFIGURATION_TYPE);
+							} else if (!type.getNodeValue().equals(EDITHELPERADVICECONFIGURATION_TYPE)) {
+								editHelperAdvice.removeAttribute(EDITHELPERADVICECLASSNAME_ATTRIBUTE);
+							}
+
+							editHelperAdvice.removeAttribute(NAME_ATTRIBUTE);
+							editHelperAdvice.removeAttribute(IDENTIFIER_ATTRIBUTE);
+							editHelperAdvice.removeAttribute(INHERITANCE_ATTRIBUTE);
+						}
+
+						NodeList adviceBindingsConfigurations = root.getElementsByTagName(ADVICEBINDINGSCONFIGURATIONS_TAG);
+
+						for (int i = 0; i < adviceBindingsConfigurations.getLength(); i++) {
+							Element adviceBinding = (Element) adviceBindingsConfigurations.item(i);
+
+							Node type = adviceBinding.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
+
+							if (type == null) {
+								adviceBinding.setAttribute(TYPE_ATTRIBUTE, ADVICEBINDINGCONFIGURATION_TYPE);
+							} else if (!type.getNodeValue().equals(ADVICEBINDINGCONFIGURATION_TYPE)) {
+								adviceBinding.removeAttribute(EDITHELPERADVICECLASSNAME_ATTRIBUTE);
+							}
+
+							adviceBinding.removeAttribute(NAME_ATTRIBUTE);
+						}
+
+						NodeList matcherConfigurations = root.getElementsByTagName(MATCHERCONFIGURATION_TAG);
+
+						for (int i = 0; i < matcherConfigurations.getLength(); i++) {
+							Element matcher = (Element) matcherConfigurations.item(i);
+
+							Node type = matcher.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
+
+							if (type == null) {
+								matcher.setAttribute(TYPE_ATTRIBUTE, MATCHER_TYPE);
+							} else if (!type.getNodeValue().equals(MATCHER_TYPE)) {
+								matcher.removeAttribute(MATCHERCLASSNAME_ATTRIBUTE);
+							}
+						}
+
+						NodeList invariantRuleConfigurations = root.getElementsByTagName(INVARIANTRULECONFIGURATION_TAG);
+
+
+						for (int i = 0; i < invariantRuleConfigurations.getLength(); i++) {
+							Element invariantRule = (Element) invariantRuleConfigurations.item(i);
+
+							doc.renameNode(invariantRule, null, RULECONFIGURATION_TAG);
+
+
+						}
+
+						migrate(root.getChildNodes(), mapMigration);
+
+						Transformer transformer = TransformerFactory.newInstance().newTransformer();
+						transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+						Result output = new StreamResult(file);
+						Source input = new DOMSource(doc);
+
+						transformer.transform(input, output);
+
+
+					} catch (ParserConfigurationException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (SAXException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (IOException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (CoreException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (TransformerConfigurationException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (TransformerFactoryConfigurationError e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (TransformerException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+
+				}
+			}
+
+		}
+		return null;
+	}
+
+
+
+	void migrate(NodeList nodeList, Map<String, String> mapMigration) {
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Node childNode = nodeList.item(i);
+
+			NamedNodeMap attributes = childNode.getAttributes();
+			if (attributes != null) {
+				for (int j = 0; j < attributes.getLength(); j++) {
+					Node childAttr = attributes.item(j);
+
+					if (childAttr.getNodeName().equals(TYPE_ATTRIBUTE)) {
+
+						for (String old : mapMigration.keySet()) {
+							if (childAttr.getNodeValue().contains(old)) {
+								String newNS = mapMigration.get(old);
+								String newValue = childAttr.getNodeValue().replace(old, newNS);
+								childAttr.setNodeValue(newValue);
+							}
+						}
+
+					}
+				}
+			}
+
+			NodeList children = childNode.getChildNodes();
+			if (children != null) {
+				migrate(children, mapMigration);
+			}
+		}
+	}
+
+
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesContentProvider.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesContentProvider.java
index 9714f998a45..2a7be16c7dd 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesContentProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesContentProvider.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.providers;

+package org.eclipse.papyrus.dev.types.providers;

 

 import java.util.ArrayList;

 import java.util.Collections;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
 import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;

 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.elementtypesconfigurations.developer.utils.IElementTypeComparator;

+import org.eclipse.papyrus.dev.types.utils.IElementTypeComparator;

 

 public class ElementTypesContentProvider implements ITreeContentProvider {

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesDetailsContentProvider.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsContentProvider.java
index 10a3a094a65..2b919398f82 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesDetailsContentProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsContentProvider.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.providers;

+package org.eclipse.papyrus.dev.types.providers;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.elementtypesconfigurations.developer.utils.AdvicesComparator;

+import org.eclipse.papyrus.dev.types.utils.AdvicesComparator;

 

 public class ElementTypesDetailsContentProvider implements ITreeContentProvider {

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesDetailsLabelProvider.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsLabelProvider.java
index 2736e4dddc8..508b2bce445 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesDetailsLabelProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesDetailsLabelProvider.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.providers;

+package org.eclipse.papyrus.dev.types.providers;

 

 import java.util.List;

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesLabelProvider.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesLabelProvider.java
index fa89e5858e3..d058a520729 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesLabelProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/ElementTypesLabelProvider.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.providers;

+package org.eclipse.papyrus.dev.types.providers;

 

 import java.io.IOException;

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesConfigurationsEventContentProvider.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventContentProvider.java
index 54b2d0c9a4e..8968ed35174 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesConfigurationsEventContentProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventContentProvider.java
@@ -1,161 +1,161 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.elementtypesconfigurations.developer.providers;
-
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.ElementTypesConfigurationsEventsChain;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AbstractElementTypesConfigurationsEvent;
-
-
-public class ElementTypesConfigurationsEventContentProvider implements ITreeContentProvider {
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 *
-	 */
-	@Override
-	public void dispose() {
-		// TODO Auto-generated method stub
-
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 *
-	 * @param viewer
-	 * @param oldInput
-	 * @param newInput
-	 */
-	@Override
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 *
-	 * @param inputElement
-	 * @return
-	 */
-	@Override
-	public Object[] getElements(Object inputElement) {
-		List<ElementTypesConfigurationsEventsChain> result = new ArrayList<ElementTypesConfigurationsEventsChain>();
-		if (inputElement instanceof List<?>) {
-			List<?> inputSet = (List<?>) inputElement;
-			for (Object element : inputSet) {
-				if (element instanceof ElementTypesConfigurationsEventsChain) {
-					result.add((ElementTypesConfigurationsEventsChain) element);
-				}
-			}
-		}
-
-		Collections.sort(result, new Comparator<ElementTypesConfigurationsEventsChain>() {
-
-			@Override
-			public int compare(ElementTypesConfigurationsEventsChain o1, ElementTypesConfigurationsEventsChain o2) {
-				if (o1.getTimestamp() > o2.getTimestamp()) {
-					return -1;
-				}
-				return 1;
-			}
-		});
-
-
-		return result.toArray();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 *
-	 * @param parentElement
-	 * @return
-	 */
-	@Override
-	public Object[] getChildren(Object parentElement) {
-
-
-		List<Object> result = new ArrayList<Object>();
-		if (parentElement instanceof ElementTypesConfigurationsEventsChain) {
-			ElementTypesConfigurationsEventsChain elementTypesConfigurationsEventsChain = (ElementTypesConfigurationsEventsChain) parentElement;
-
-			List<AbstractElementTypesConfigurationsEvent> adviceRequestConfigurationEvents = elementTypesConfigurationsEventsChain.getAdviceRequestConfigurationEvents();
-			if (!adviceRequestConfigurationEvents.isEmpty()) {
-				result.add(new AbstractMap.SimpleEntry<String, Object>("AdviceRequestConfigurationEvents", adviceRequestConfigurationEvents));
-			}
-			AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent = elementTypesConfigurationsEventsChain.getEditHelperRequestConfigurationEvent();
-			if (editHelperRequestConfigurationEvent != null) {
-				result.add(editHelperRequestConfigurationEvent);
-			}
-			List<AbstractElementTypesConfigurationsEvent> adviceApprovalEvents = elementTypesConfigurationsEventsChain.getAdviceApprovalEvents();
-			if (!adviceApprovalEvents.isEmpty()) {
-				result.add(new AbstractMap.SimpleEntry<String, Object>("AdviceApprovalEvents", adviceApprovalEvents));
-			}
-			AbstractElementTypesConfigurationsEvent editHelperApprovalEvent = elementTypesConfigurationsEventsChain.getEditHelperApprovalEvent();
-			if (editHelperApprovalEvent != null) {
-				result.add(editHelperApprovalEvent);
-			}
-			List<AbstractElementTypesConfigurationsEvent> beforeAdvicesCommandsEvents = elementTypesConfigurationsEventsChain.getBeforeAdvicesCommandsEvents();
-			if (!beforeAdvicesCommandsEvents.isEmpty()) {
-				result.add(new AbstractMap.SimpleEntry<String, Object>("BeforeAdvicesCommandsEvents", beforeAdvicesCommandsEvents));
-			}
-			AbstractElementTypesConfigurationsEvent editHelperCommandEvent = elementTypesConfigurationsEventsChain.getEditHelperCommandEvent();
-			if (editHelperCommandEvent != null) {
-				result.add(editHelperCommandEvent);
-			}
-			List<AbstractElementTypesConfigurationsEvent> afterAdvicesCommandsEvents = elementTypesConfigurationsEventsChain.getAfterAdvicesCommandsEvents();
-			if (!afterAdvicesCommandsEvents.isEmpty()) {
-				result.add(new AbstractMap.SimpleEntry<String, Object>("AfterAdvicesCommandsEvents", afterAdvicesCommandsEvents));
-			}
-		} else if (parentElement instanceof Map.Entry) {
-			Object value = ((Map.Entry<?, ?>) parentElement).getValue();
-			if (value instanceof Collection) {
-				result.addAll((Collection<?>) value);
-			}
-		}
-		return result.toArray();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-	 *
-	 * @param element
-	 * @return
-	 */
-	@Override
-	public Object getParent(Object element) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-	 *
-	 * @param element
-	 * @return
-	 */
-	@Override
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length == 0 ? false : true;
-	}
-
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.dev.types.providers;

+

+import java.util.AbstractMap;

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.Comparator;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.jface.viewers.ITreeContentProvider;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.papyrus.infra.types.core.notification.TypesEventsChain;

+import org.eclipse.papyrus.infra.types.core.notification.events.AbstractTypesEvent;

+

+

+public class TypesEventContentProvider implements ITreeContentProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

+	 *

+	 */

+	@Override

+	public void dispose() {

+		// TODO Auto-generated method stub

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

+	 *

+	 * @param viewer

+	 * @param oldInput

+	 * @param newInput

+	 */

+	@Override

+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		// TODO Auto-generated method stub

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

+	 *

+	 * @param inputElement

+	 * @return

+	 */

+	@Override

+	public Object[] getElements(Object inputElement) {

+		List<TypesEventsChain> result = new ArrayList<TypesEventsChain>();

+		if (inputElement instanceof List<?>) {

+			List<?> inputSet = (List<?>) inputElement;

+			for (Object element : inputSet) {

+				if (element instanceof TypesEventsChain) {

+					result.add((TypesEventsChain) element);

+				}

+			}

+		}

+

+		Collections.sort(result, new Comparator<TypesEventsChain>() {

+

+			@Override

+			public int compare(TypesEventsChain o1, TypesEventsChain o2) {

+				if (o1.getTimestamp() > o2.getTimestamp()) {

+					return -1;

+				}

+				return 1;

+			}

+		});

+

+

+		return result.toArray();

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

+	 *

+	 * @param parentElement

+	 * @return

+	 */

+	@Override

+	public Object[] getChildren(Object parentElement) {

+

+

+		List<Object> result = new ArrayList<Object>();

+		if (parentElement instanceof TypesEventsChain) {

+			TypesEventsChain typesEventsChain = (TypesEventsChain) parentElement;

+

+			List<AbstractTypesEvent> adviceRequestConfigurationEvents = typesEventsChain.getAdviceRequestConfigurationEvents();

+			if (!adviceRequestConfigurationEvents.isEmpty()) {

+				result.add(new AbstractMap.SimpleEntry<String, Object>("AdviceRequestConfigurationEvents", adviceRequestConfigurationEvents));

+			}

+			AbstractTypesEvent editHelperRequestConfigurationEvent = typesEventsChain.getEditHelperRequestConfigurationEvent();

+			if (editHelperRequestConfigurationEvent != null) {

+				result.add(editHelperRequestConfigurationEvent);

+			}

+			List<AbstractTypesEvent> adviceApprovalEvents = typesEventsChain.getAdviceApprovalEvents();

+			if (!adviceApprovalEvents.isEmpty()) {

+				result.add(new AbstractMap.SimpleEntry<String, Object>("AdviceApprovalEvents", adviceApprovalEvents));

+			}

+			AbstractTypesEvent editHelperApprovalEvent = typesEventsChain.getEditHelperApprovalEvent();

+			if (editHelperApprovalEvent != null) {

+				result.add(editHelperApprovalEvent);

+			}

+			List<AbstractTypesEvent> beforeAdvicesCommandsEvents = typesEventsChain.getBeforeAdvicesCommandsEvents();

+			if (!beforeAdvicesCommandsEvents.isEmpty()) {

+				result.add(new AbstractMap.SimpleEntry<String, Object>("BeforeAdvicesCommandsEvents", beforeAdvicesCommandsEvents));

+			}

+			AbstractTypesEvent editHelperCommandEvent = typesEventsChain.getEditHelperCommandEvent();

+			if (editHelperCommandEvent != null) {

+				result.add(editHelperCommandEvent);

+			}

+			List<AbstractTypesEvent> afterAdvicesCommandsEvents = typesEventsChain.getAfterAdvicesCommandsEvents();

+			if (!afterAdvicesCommandsEvents.isEmpty()) {

+				result.add(new AbstractMap.SimpleEntry<String, Object>("AfterAdvicesCommandsEvents", afterAdvicesCommandsEvents));

+			}

+		} else if (parentElement instanceof Map.Entry) {

+			Object value = ((Map.Entry<?, ?>) parentElement).getValue();

+			if (value instanceof Collection) {

+				result.addAll((Collection<?>) value);

+			}

+		}

+		return result.toArray();

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 */

+	@Override

+	public Object getParent(Object element) {

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 */

+	@Override

+	public boolean hasChildren(Object element) {

+		return getChildren(element).length == 0 ? false : true;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesConfigurationsEventLabelProvider.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventLabelProvider.java
index ad1fe1cf275..5fda3e2d887 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/providers/ElementTypesConfigurationsEventLabelProvider.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/providers/TypesEventLabelProvider.java
@@ -1,135 +1,135 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.elementtypesconfigurations.developer.providers;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.ElementTypesConfigurationsEventsChain;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ElementTypesConfigurationsEventType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-
-public class ElementTypesConfigurationsEventLabelProvider extends org.eclipse.jface.viewers.LabelProvider implements IColorProvider {
-
-	@Override
-	public Image getImage(Object element) {
-
-		return null;
-	}
-
-	@Override
-	public String getText(Object element) {
-		String result = "";
-		Calendar calendar = Calendar.getInstance();
-		SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd - hh:mm:ss:SSS");
-		if (element instanceof IElementTypesConfigurationsEvent) {
-			calendar.setTimeInMillis(((IElementTypesConfigurationsEvent) element).getTimestamp());
-			result += "[" + formater.format(calendar.getTime()) + "] " + ((IElementTypesConfigurationsEvent) element).getEventName();
-		} else if (element instanceof ElementTypesConfigurationsEventsChain) {
-			calendar.setTimeInMillis(((ElementTypesConfigurationsEventsChain) element).getTimestamp());
-			result += "[" + formater.format(calendar.getTime()) + "] " + ((ElementTypesConfigurationsEventsChain) element).getName();
-		} else if (element instanceof Map.Entry) {
-			result += ((Map.Entry<?, ?>) element).getKey().toString();
-		} else {
-			result += element.toString();
-		}
-		return result;
-	}
-
-	Color yellow = new Color(Display.getCurrent(), new RGB(255, 200, 0));
-	Color green = new Color(Display.getCurrent(), new RGB(0, 128, 0));
-	Color red = new Color(Display.getCurrent(), new RGB(255, 0, 0));
-	Color black = new Color(Display.getCurrent(), new RGB(0, 0, 0));
-	Color blue = new Color(Display.getCurrent(), new RGB(0, 0, 255));
-
-
-	/**
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 *
-	 * @param element
-	 * @return
-	 */
-	@Override
-	public Color getForeground(Object element) {
-		if (element instanceof IElementTypesConfigurationsEvent) {
-			if (((IElementTypesConfigurationsEvent) element).getEventType().equals(ElementTypesConfigurationsEventType.Disapproved)) {
-				return red;
-			} else if (((IElementTypesConfigurationsEvent) element).getEventType().equals(ElementTypesConfigurationsEventType.Unexecutable)) {
-				return red;
-			} else if (((IElementTypesConfigurationsEvent) element).getEventType().equals(ElementTypesConfigurationsEventType.Executable)) {
-				return green;
-			} else if (((IElementTypesConfigurationsEvent) element).getEventType().equals(ElementTypesConfigurationsEventType.Approved)) {
-				return green;
-			} else if (((IElementTypesConfigurationsEvent) element).getEventType().equals(ElementTypesConfigurationsEventType.Identity)) {
-				return yellow;
-			} else if (((IElementTypesConfigurationsEvent) element).getEventType().equals(ElementTypesConfigurationsEventType.RequestConfiguration)) {
-				return blue;
-			}
-		} else if (element instanceof Map.Entry) {
-			Object value = ((Map.Entry<?, ?>) element).getValue();
-			if (value instanceof Collection) {
-				return checkWorst((Collection<?>) value, true);
-			}
-		} else if (element instanceof ElementTypesConfigurationsEventsChain) {
-			return checkWorst(((ElementTypesConfigurationsEventsChain) element).getAllEvents(), false);
-		}
-		return black;
-	}
-
-	/**
-	 * @param value
-	 */
-	private Color checkWorst(Collection<?> value, boolean considerRequestConfiguration) {
-		Color result = green;
-		for (Object object : value) {
-			if (((IElementTypesConfigurationsEvent) object).getEventType().equals(ElementTypesConfigurationsEventType.Disapproved)) {
-				return red;
-			} else if (((IElementTypesConfigurationsEvent) object).getEventType().equals(ElementTypesConfigurationsEventType.Unexecutable)) {
-				return red;
-			} else if (((IElementTypesConfigurationsEvent) object).getEventType().equals(ElementTypesConfigurationsEventType.Identity)) {
-				if (result == green) {
-					result = yellow;
-				}
-			} else if (((IElementTypesConfigurationsEvent) object).getEventType().equals(ElementTypesConfigurationsEventType.RequestConfiguration)) {
-				if (considerRequestConfiguration) {
-					if (result != yellow && result != red) {
-						result = blue;
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 *
-	 * @param element
-	 * @return
-	 */
-	@Override
-	public Color getBackground(Object element) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.dev.types.providers;

+

+import java.text.SimpleDateFormat;

+import java.util.Calendar;

+import java.util.Collection;

+import java.util.Map;

+

+import org.eclipse.jface.viewers.IColorProvider;

+import org.eclipse.papyrus.infra.types.core.notification.TypesEventsChain;

+import org.eclipse.papyrus.infra.types.core.notification.events.TypesEventKind;

+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.graphics.RGB;

+import org.eclipse.swt.widgets.Display;

+

+

+public class TypesEventLabelProvider extends org.eclipse.jface.viewers.LabelProvider implements IColorProvider {

+

+	@Override

+	public Image getImage(Object element) {

+

+		return null;

+	}

+

+	@Override

+	public String getText(Object element) {

+		String result = "";

+		Calendar calendar = Calendar.getInstance();

+		SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd - hh:mm:ss:SSS");

+		if (element instanceof ITypesEvent) {

+			calendar.setTimeInMillis(((ITypesEvent) element).getTimestamp());

+			result += "[" + formater.format(calendar.getTime()) + "] " + ((ITypesEvent) element).getEventName();

+		} else if (element instanceof TypesEventsChain) {

+			calendar.setTimeInMillis(((TypesEventsChain) element).getTimestamp());

+			result += "[" + formater.format(calendar.getTime()) + "] " + ((TypesEventsChain) element).getName();

+		} else if (element instanceof Map.Entry) {

+			result += ((Map.Entry<?, ?>) element).getKey().toString();

+		} else {

+			result += element.toString();

+		}

+		return result;

+	}

+

+	Color yellow = new Color(Display.getCurrent(), new RGB(255, 200, 0));

+	Color green = new Color(Display.getCurrent(), new RGB(0, 128, 0));

+	Color red = new Color(Display.getCurrent(), new RGB(255, 0, 0));

+	Color black = new Color(Display.getCurrent(), new RGB(0, 0, 0));

+	Color blue = new Color(Display.getCurrent(), new RGB(0, 0, 255));

+

+

+	/**

+	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 */

+	@Override

+	public Color getForeground(Object element) {

+		if (element instanceof ITypesEvent) {

+			if (((ITypesEvent) element).getEventType().equals(TypesEventKind.Disapproved)) {

+				return red;

+			} else if (((ITypesEvent) element).getEventType().equals(TypesEventKind.Unexecutable)) {

+				return red;

+			} else if (((ITypesEvent) element).getEventType().equals(TypesEventKind.Executable)) {

+				return green;

+			} else if (((ITypesEvent) element).getEventType().equals(TypesEventKind.Approved)) {

+				return green;

+			} else if (((ITypesEvent) element).getEventType().equals(TypesEventKind.Identity)) {

+				return yellow;

+			} else if (((ITypesEvent) element).getEventType().equals(TypesEventKind.RequestConfiguration)) {

+				return blue;

+			}

+		} else if (element instanceof Map.Entry) {

+			Object value = ((Map.Entry<?, ?>) element).getValue();

+			if (value instanceof Collection) {

+				return checkWorst((Collection<?>) value, true);

+			}

+		} else if (element instanceof TypesEventsChain) {

+			return checkWorst(((TypesEventsChain) element).getAllEvents(), false);

+		}

+		return black;

+	}

+

+	/**

+	 * @param value

+	 */

+	private Color checkWorst(Collection<?> value, boolean considerRequestConfiguration) {

+		Color result = green;

+		for (Object object : value) {

+			if (((ITypesEvent) object).getEventType().equals(TypesEventKind.Disapproved)) {

+				return red;

+			} else if (((ITypesEvent) object).getEventType().equals(TypesEventKind.Unexecutable)) {

+				return red;

+			} else if (((ITypesEvent) object).getEventType().equals(TypesEventKind.Identity)) {

+				if (result == green) {

+					result = yellow;

+				}

+			} else if (((ITypesEvent) object).getEventType().equals(TypesEventKind.RequestConfiguration)) {

+				if (considerRequestConfiguration) {

+					if (result != yellow && result != red) {

+						result = blue;

+					}

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)

+	 *

+	 * @param element

+	 * @return

+	 */

+	@Override

+	public Color getBackground(Object element) {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/AdvicesComparator.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/AdvicesComparator.java
index 9df1c0773d7..781b4429dca 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/AdvicesComparator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/AdvicesComparator.java
@@ -11,7 +11,7 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;

+package org.eclipse.papyrus.dev.types.utils;

 

 import java.util.Comparator;

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/EClassComparator.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/EClassComparator.java
index 60b1249bfee..43edf19b7f2 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/EClassComparator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/EClassComparator.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;

+package org.eclipse.papyrus.dev.types.utils;

 

 import java.util.Comparator;

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/ElementTypeConfigurationComparator.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeConfigurationComparator.java
index 73bb842866b..6632433a54f 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/ElementTypeConfigurationComparator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeConfigurationComparator.java
@@ -10,11 +10,11 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;

+package org.eclipse.papyrus.dev.types.utils;

 

 import java.util.Comparator;

 

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;

+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

 

 public class ElementTypeConfigurationComparator implements Comparator<ElementTypeConfiguration> {

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/ElementTypeRegistryUtils.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeRegistryUtils.java
index 16ed6ae5147..bd6cd54695b 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/ElementTypeRegistryUtils.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/ElementTypeRegistryUtils.java
@@ -10,12 +10,12 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;

+package org.eclipse.papyrus.dev.types.utils;

 

 import java.lang.reflect.Field;

 

 import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.dev.types.Activator;

 

 

 public class ElementTypeRegistryUtils {

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/GenerateElementTypesConfigurationsUtils.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/GenerateElementTypesConfigurationsUtils.java
index 09519bf8b28..fbc452094b2 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/GenerateElementTypesConfigurationsUtils.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/GenerateElementTypesConfigurationsUtils.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;

+package org.eclipse.papyrus.dev.types.utils;

 

 import java.util.ArrayList;

 import java.util.Collection;

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/IElementTypeComparator.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/IElementTypeComparator.java
index f015527581a..b557679d875 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/IElementTypeComparator.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/IElementTypeComparator.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;

+package org.eclipse.papyrus.dev.types.utils;

 

 import java.util.Comparator;

 

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/NotifierNullEditHelper.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/NotifierNullEditHelper.java
index 9c1ed6085ec..c7297f9d370 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/NotifierNullEditHelper.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/NotifierNullEditHelper.java
@@ -1,30 +1,30 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.AbstractNotifierEditHelper;
-
-/**
- * Edit helper for the NullElementType that considers before and after
- * advice, only.
- */
-public class NotifierNullEditHelper
-		extends AbstractNotifierEditHelper {
-
-	protected ICommand getInsteadCommand(IEditCommandRequest req) {
-		return null;
-	}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.dev.types.utils;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.types.core.notification.AbstractNotifierEditHelper;

+

+/**

+ * Edit helper for the NullElementType that considers before and after

+ * advice, only.

+ */

+public class NotifierNullEditHelper

+		extends AbstractNotifierEditHelper {

+

+	protected ICommand getInsteadCommand(IEditCommandRequest req) {

+		return null;

+	}

 }
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/ElementTypesConfigurationsEventPrinter.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/TypesEventPrinter.java
index 334f7317b5d..88ef53da10f 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/utils/ElementTypesConfigurationsEventPrinter.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/utils/TypesEventPrinter.java
@@ -1,138 +1,138 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.elementtypesconfigurations.developer.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperRequestConfigurationEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;
-
-public class ElementTypesConfigurationsEventPrinter {
-	public static Map<String, String> getEventDetails(IElementTypesConfigurationsEvent event) {
-		Map<String, String> result = new HashMap<>();
-
-		if (event instanceof AdviceApprovedEvent) {
-			result.put("Approved Advice", ((AdviceApprovedEvent) event).getAdvice().getClass().getName());
-		} else if (event instanceof AdviceDisapprovedEvent) {
-			result.put("Disapprover Advice", ((AdviceDisapprovedEvent) event).getAdvice().getClass().getName());
-		} else if (event instanceof EditHelperApprovedEvent) {
-			result.put("Approver edithelper", ((EditHelperApprovedEvent) event).getEditHelper().getClass().getName());
-		} else if (event instanceof EditHelperDisapprovedEvent) {
-			result.put("Disapprover edithelper", ((EditHelperDisapprovedEvent) event).getEditHelper().getClass().getName());
-		} else if (event instanceof ExecutableAdviceEvent) {
-			result.put("Advice", ((ExecutableAdviceEvent) event).getAdvice().getClass().getName());
-			result.put("Phase ", ((ExecutableAdviceEvent) event).getAdvicePhase().name());
-			result.put("Executable command", ((ExecutableAdviceEvent) event).getCommand().getClass().getName());
-		} else if (event instanceof ExecutableEditHelperEvent) {
-			result.put("Executable command from edithelper", ((ExecutableEditHelperEvent) event).getEditHelper().getClass().getName());
-			result.put("Executable command", ((ExecutableEditHelperEvent) event).getCommand().getClass().getName());
-		} else if (event instanceof IdentityAdviceEvent) {
-			result.put("Identity Advice", ((IdentityAdviceEvent) event).getAdvice().getClass().getName());
-			result.put("Phase ", ((IdentityAdviceEvent) event).getAdvicePhase().name());
-		} else if (event instanceof IdentityEditHelperEvent) {
-			result.put("Identity EditHelper", ((IdentityEditHelperEvent) event).getEditHelper().getClass().getName());
-		} else if (event instanceof UnexecutableAdviceEvent) {
-			result.put("Unexecutable Advice", ((UnexecutableAdviceEvent) event).getAdvice().getClass().getName());
-			result.put("Phase ", ((UnexecutableAdviceEvent) event).getAdvicePhase().name());
-			result.put("Unexecutable command", ((UnexecutableAdviceEvent) event).getCommand().getClass().getName());
-		} else if (event instanceof UnexecutableEditHelperEvent) {
-			result.put("Unexecutable command from edithelper", ((UnexecutableEditHelperEvent) event).getEditHelper().getClass().getName());
-			result.put("Unexecutable command", ((UnexecutableEditHelperEvent) event).getCommand().getClass().getName());
-		} else if (event instanceof AdviceRequestConfigurationEvent) {
-			result.put("RequestConfiguration Advice", ((AdviceRequestConfigurationEvent) event).getAdvice().getClass().getName());
-		} else if (event instanceof EditHelperRequestConfigurationEvent) {
-			result.put("RequestConfiguration EditHelper", ((EditHelperRequestConfigurationEvent) event).getEditHelper().getClass().getName());
-		}
-
-		if (event instanceof IAdviceEvent) {
-			String adviceNames = "";
-			for (IEditHelperAdvice editHelperAdvice : ((IAdviceEvent) event).getAdvices()) {
-				adviceNames += " -" + editHelperAdvice.getClass().getName() + "\n";
-			}
-			result.put("Among the following advices ", adviceNames);
-		}
-
-		return result;
-	}
-
-	public static String printHtmlEvent(Map<String, String> details) {
-
-
-		String html = "<table border=\"1\">";
-		for (String key : details.keySet()) {
-			html += "<tr>";
-			html += "<td><b>" + key + "<b></td>";
-			html += "<td>" + details.get(key) + "</td>";
-			html += "</tr>";
-		}
-		html += "</table>";
-
-		html = html.replaceAll("\\n", "<br>");
-
-		return html;
-	}
-
-	/**
-	 * @param req
-	 * @return
-	 */
-	public static String printHtmRequest(IEditCommandRequest req) {
-		String result = "<ul>";
-		result += "<li><b>Request</b>: " + req + "</li>";
-		result += "<li><b>Label</b>: " + req.getLabel() + "</li>";
-		result += "<li><b>Kind</b>: " + req.getClass().getName() + "</li>";
-		result += "<li><b>ElementsToEdit</b>: " + req.getElementsToEdit() + "</li>";
-		result += "<li><b>Parameters</b>:</li>";
-
-		if (!req.getParameters().keySet().isEmpty()) {
-			result += "<ul>";
-
-			for (Object key : req.getParameters().keySet()) {
-				result += "<li><b>" + key + "</b> <-> " + req.getParameters().get(key) + "</li>";
-			}
-			result += "</ul>";
-		}
-		result += "<li><b>EditHelperContext</b>: " + req.getEditHelperContext() + "</li>";
-
-		if (req instanceof CreateElementRequest) {
-			result += "<li><b>ElementType</b>: " + ((CreateElementRequest) req).getElementType() + "</li>";
-			result += "<li><b>Container</b>: " + ((CreateElementRequest) req).getContainer() + "</li>";
-			result += "<li><b>ContainmentFeature</b>: " + ((CreateElementRequest) req).getContainmentFeature() + "</li>";
-			if (req instanceof CreateRelationshipRequest) {
-				result += "<li><b>Source</b>: " + ((CreateRelationshipRequest) req).getSource() + "</li>";
-				result += "<li><b>Target</b>: " + ((CreateRelationshipRequest) req).getTarget() + "</li>";
-			}
-		}
-		result += "</ul>";
-
-		return result;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.dev.types.utils;

+

+import java.util.HashMap;

+import java.util.Map;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperRequestEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;

+

+public class TypesEventPrinter {

+	public static Map<String, String> getEventDetails(ITypesEvent event) {

+		Map<String, String> result = new HashMap<>();

+

+		if (event instanceof AdviceApprovedEvent) {

+			result.put("Approved Advice", ((AdviceApprovedEvent) event).getAdvice().getClass().getName());

+		} else if (event instanceof AdviceDisapprovedEvent) {

+			result.put("Disapprover Advice", ((AdviceDisapprovedEvent) event).getAdvice().getClass().getName());

+		} else if (event instanceof EditHelperApprovedEvent) {

+			result.put("Approver edithelper", ((EditHelperApprovedEvent) event).getEditHelper().getClass().getName());

+		} else if (event instanceof EditHelperDisapprovedEvent) {

+			result.put("Disapprover edithelper", ((EditHelperDisapprovedEvent) event).getEditHelper().getClass().getName());

+		} else if (event instanceof ExecutableAdviceEvent) {

+			result.put("Advice", ((ExecutableAdviceEvent) event).getAdvice().getClass().getName());

+			result.put("Phase ", ((ExecutableAdviceEvent) event).getAdvicePhase().name());

+			result.put("Executable command", ((ExecutableAdviceEvent) event).getCommand().getClass().getName());

+		} else if (event instanceof ExecutableEditHelperEvent) {

+			result.put("Executable command from edithelper", ((ExecutableEditHelperEvent) event).getEditHelper().getClass().getName());

+			result.put("Executable command", ((ExecutableEditHelperEvent) event).getCommand().getClass().getName());

+		} else if (event instanceof IdentityAdviceEvent) {

+			result.put("Identity Advice", ((IdentityAdviceEvent) event).getAdvice().getClass().getName());

+			result.put("Phase ", ((IdentityAdviceEvent) event).getAdvicePhase().name());

+		} else if (event instanceof IdentityEditHelperEvent) {

+			result.put("Identity EditHelper", ((IdentityEditHelperEvent) event).getEditHelper().getClass().getName());

+		} else if (event instanceof UnexecutableAdviceEvent) {

+			result.put("Unexecutable Advice", ((UnexecutableAdviceEvent) event).getAdvice().getClass().getName());

+			result.put("Phase ", ((UnexecutableAdviceEvent) event).getAdvicePhase().name());

+			result.put("Unexecutable command", ((UnexecutableAdviceEvent) event).getCommand().getClass().getName());

+		} else if (event instanceof UnexecutableEditHelperEvent) {

+			result.put("Unexecutable command from edithelper", ((UnexecutableEditHelperEvent) event).getEditHelper().getClass().getName());

+			result.put("Unexecutable command", ((UnexecutableEditHelperEvent) event).getCommand().getClass().getName());

+		} else if (event instanceof AdviceRequestEvent) {

+			result.put("RequestConfiguration Advice", ((AdviceRequestEvent) event).getAdvice().getClass().getName());

+		} else if (event instanceof EditHelperRequestEvent) {

+			result.put("RequestConfiguration EditHelper", ((EditHelperRequestEvent) event).getEditHelper().getClass().getName());

+		}

+

+		if (event instanceof IAdviceEvent) {

+			String adviceNames = "";

+			for (IEditHelperAdvice editHelperAdvice : ((IAdviceEvent) event).getAdvices()) {

+				adviceNames += " -" + editHelperAdvice.getClass().getName() + "\n";

+			}

+			result.put("Among the following advices ", adviceNames);

+		}

+

+		return result;

+	}

+

+	public static String printHtmlEvent(Map<String, String> details) {

+

+

+		String html = "<table border=\"1\">";

+		for (String key : details.keySet()) {

+			html += "<tr>";

+			html += "<td><b>" + key + "<b></td>";

+			html += "<td>" + details.get(key) + "</td>";

+			html += "</tr>";

+		}

+		html += "</table>";

+

+		html = html.replaceAll("\\n", "<br>");

+

+		return html;

+	}

+

+	/**

+	 * @param req

+	 * @return

+	 */

+	public static String printHtmRequest(IEditCommandRequest req) {

+		String result = "<ul>";

+		result += "<li><b>Request</b>: " + req + "</li>";

+		result += "<li><b>Label</b>: " + req.getLabel() + "</li>";

+		result += "<li><b>Kind</b>: " + req.getClass().getName() + "</li>";

+		result += "<li><b>ElementsToEdit</b>: " + req.getElementsToEdit() + "</li>";

+		result += "<li><b>Parameters</b>:</li>";

+

+		if (!req.getParameters().keySet().isEmpty()) {

+			result += "<ul>";

+

+			for (Object key : req.getParameters().keySet()) {

+				result += "<li><b>" + key + "</b> <-> " + req.getParameters().get(key) + "</li>";

+			}

+			result += "</ul>";

+		}

+		result += "<li><b>EditHelperContext</b>: " + req.getEditHelperContext() + "</li>";

+

+		if (req instanceof CreateElementRequest) {

+			result += "<li><b>ElementType</b>: " + ((CreateElementRequest) req).getElementType() + "</li>";

+			result += "<li><b>Container</b>: " + ((CreateElementRequest) req).getContainer() + "</li>";

+			result += "<li><b>ContainmentFeature</b>: " + ((CreateElementRequest) req).getContainmentFeature() + "</li>";

+			if (req instanceof CreateRelationshipRequest) {

+				result += "<li><b>Source</b>: " + ((CreateRelationshipRequest) req).getSource() + "</li>";

+				result += "<li><b>Target</b>: " + ((CreateRelationshipRequest) req).getTarget() + "</li>";

+			}

+		}

+		result += "</ul>";

+

+		return result;

+	}

+}

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/RegistredElementTypesView.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/RegistredElementTypesView.java
index b41803577ec..37ee95d146c 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/RegistredElementTypesView.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/RegistredElementTypesView.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.elementtypesconfigurations.developer.view;

+package org.eclipse.papyrus.dev.types.view;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -22,10 +22,10 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.jface.viewers.ISelectionChangedListener;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesContentProvider;

-import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesDetailsContentProvider;

-import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesDetailsLabelProvider;

-import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesLabelProvider;

+import org.eclipse.papyrus.dev.types.providers.ElementTypesContentProvider;

+import org.eclipse.papyrus.dev.types.providers.ElementTypesDetailsContentProvider;

+import org.eclipse.papyrus.dev.types.providers.ElementTypesDetailsLabelProvider;

+import org.eclipse.papyrus.dev.types.providers.ElementTypesLabelProvider;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.custom.SashForm;

 import org.eclipse.swt.events.SelectionEvent;

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/ElementTypesConfigurationsListenerView.java b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/TypesConfigurationsListenerView.java
index 0953772c4b6..cbbb3ae8ce4 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/view/ElementTypesConfigurationsListenerView.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/src/org/eclipse/papyrus/dev/types/view/TypesConfigurationsListenerView.java
@@ -1,227 +1,227 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.elementtypesconfigurations.developer.view;
-
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
-import org.eclipse.gmf.runtime.emf.type.core.NullElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.Activator;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesConfigurationsEventContentProvider;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.providers.ElementTypesConfigurationsEventLabelProvider;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.utils.ElementTypeRegistryUtils;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.utils.ElementTypesConfigurationsEventPrinter;
-import org.eclipse.papyrus.elementtypesconfigurations.developer.utils.NotifierNullEditHelper;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.ElementTypesConfigurationsEventsChain;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.ElementTypesConfigurationsListenersRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.IElementTypesConfigurationsEventsChainListener;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.FilteredTree;
-import org.eclipse.ui.dialogs.PatternFilter;
-import org.eclipse.ui.part.ViewPart;
-
-public class ElementTypesConfigurationsListenerView extends ViewPart {
-
-	IClientContext context = null;
-	FilteredTree tree = null;
-	SashForm sash = null;
-	Browser browser = null;
-	IElementTypesConfigurationsEventsChainListener listener = null;
-	Text limitText = null;
-
-	List<ElementTypesConfigurationsEventsChain> eventsChains = new ArrayList<ElementTypesConfigurationsEventsChain>();
-
-	final private int MAX_SIZE = 1000;
-
-
-	@Override
-	public void createPartControl(Composite parent) {
-		parent.setLayout(new GridLayout(3, true));
-		Button startButton = new Button(parent, SWT.NONE);
-		startButton.setText("Start");
-		startButton.addMouseListener(new MouseAdapter() {
-
-
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				if (!Platform.inDebugMode()) {
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Debug mode", "You must activate debug mode to be able to use this view. ");
-				}
-
-				// Dirty work to force the NullElementType edithelper if in debug mode
-				if (Platform.inDebugMode()) {
-
-					Field nullElementTypeEditHelperField = ElementTypeRegistryUtils.getNullElementTypeEditHelper();
-
-					if (nullElementTypeEditHelperField != null) {
-						// Register fake
-
-						try {
-							nullElementTypeEditHelperField.set(NullElementType.getInstance(), new NotifierNullEditHelper());
-						} catch (IllegalArgumentException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						} catch (IllegalAccessException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-					} else {
-						Activator.log.warn("Failed to override NullElementType's EditHelper");
-					}
-
-					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Debug mode", "Be careful, as the platform is in debug mode, the NullElementType's EditHelper has been overriden");
-				}
-
-				if (listener == null) {
-					listener = new IElementTypesConfigurationsEventsChainListener() {
-
-						@Override
-						public void notifyChain(ElementTypesConfigurationsEventsChain chain) {
-							int limit;
-							String text = limitText.getText();
-							try {
-								limit = Integer.parseInt(text);
-							} catch (NumberFormatException e) {
-								limit = MAX_SIZE;
-							}
-							if (eventsChains.size() >= limit) {
-								eventsChains.remove(0);
-							}
-							eventsChains.add(chain);
-							Display.getCurrent().asyncExec(new Runnable() {
-								@Override
-								public void run() {
-									tree.getViewer().refresh();
-								}
-							});
-
-						}
-					};
-					ElementTypesConfigurationsListenersRegistry.getInstance().addEventChainListener(listener);
-				}
-			}
-
-		});
-		startButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
-		Button stopButton = new Button(parent, SWT.NONE);
-		stopButton.setText("Stop");
-		stopButton.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				ElementTypesConfigurationsListenersRegistry.getInstance().removeEventChainListener(listener);
-				listener = null;
-			}
-
-		});
-		stopButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
-		Button clearButton = new Button(parent, SWT.NONE);
-		clearButton.setText("Clear");
-		clearButton.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseUp(MouseEvent e) {
-				eventsChains.clear();
-				tree.getViewer().refresh();
-				browser.setText("");
-			}
-
-		});
-		clearButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-
-		Label label = new Label(parent, SWT.NONE);
-		label.setText("Limit: ");
-
-		limitText = new Text(parent, SWT.BORDER);
-		limitText.setText(MAX_SIZE + "");
-		limitText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
-
-		sash = new SashForm(parent, SWT.HORIZONTAL | SWT.BORDER);
-
-		sash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-
-		tree = new FilteredTree(sash, SWT.BORDER, new PatternFilter(), true);
-		tree.getViewer().setLabelProvider(new ElementTypesConfigurationsEventLabelProvider());
-		tree.getViewer().setContentProvider(new ElementTypesConfigurationsEventContentProvider());
-		tree.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {
-
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (event.getSelection() instanceof IStructuredSelection) {
-					Object first = ((IStructuredSelection) event.getSelection()).getFirstElement();
-					String result = "";
-					if (first instanceof IElementTypesConfigurationsEvent) {
-
-						Map<String, String> details = ElementTypesConfigurationsEventPrinter.getEventDetails(((IElementTypesConfigurationsEvent) first));
-						result = ElementTypesConfigurationsEventPrinter.printHtmlEvent(details);
-					} else if (first instanceof ElementTypesConfigurationsEventsChain) {
-						IEditCommandRequest req = ((ElementTypesConfigurationsEventsChain) first).getRequest();
-						result = ElementTypesConfigurationsEventPrinter.printHtmRequest(req);
-					}
-					browser.setText(result);
-				}
-
-			}
-		});
-		tree.getViewer().setInput(eventsChains);
-
-		browser = new Browser(sash, SWT.NONE);
-
-
-		sash.setWeights(new int[] { 1, 3 });
-	}
-
-
-
-	@Override
-	public void setFocus() {
-
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 *
-	 */
-	@Override
-	public void dispose() {
-		ElementTypesConfigurationsListenersRegistry.getInstance().removeEventChainListener(listener);
-		super.dispose();
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.dev.types.view;

+

+

+import java.lang.reflect.Field;

+import java.util.ArrayList;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

+import org.eclipse.gmf.runtime.emf.type.core.NullElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.papyrus.dev.types.Activator;

+import org.eclipse.papyrus.dev.types.providers.TypesEventContentProvider;

+import org.eclipse.papyrus.dev.types.providers.TypesEventLabelProvider;

+import org.eclipse.papyrus.dev.types.utils.ElementTypeRegistryUtils;

+import org.eclipse.papyrus.dev.types.utils.TypesEventPrinter;

+import org.eclipse.papyrus.dev.types.utils.NotifierNullEditHelper;

+import org.eclipse.papyrus.infra.types.core.notification.TypesEventsChain;

+import org.eclipse.papyrus.infra.types.core.notification.TypesListenersRegistry;

+import org.eclipse.papyrus.infra.types.core.notification.ITypesEventsChainListener;

+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.browser.Browser;

+import org.eclipse.swt.custom.SashForm;

+import org.eclipse.swt.events.MouseAdapter;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

+import org.eclipse.ui.dialogs.FilteredTree;

+import org.eclipse.ui.dialogs.PatternFilter;

+import org.eclipse.ui.part.ViewPart;

+

+public class TypesConfigurationsListenerView extends ViewPart {

+

+	IClientContext context = null;

+	FilteredTree tree = null;

+	SashForm sash = null;

+	Browser browser = null;

+	ITypesEventsChainListener listener = null;

+	Text limitText = null;

+

+	List<TypesEventsChain> eventsChains = new ArrayList<TypesEventsChain>();

+

+	final private int MAX_SIZE = 1000;

+

+

+	@Override

+	public void createPartControl(Composite parent) {

+		parent.setLayout(new GridLayout(3, true));

+		Button startButton = new Button(parent, SWT.NONE);

+		startButton.setText("Start");

+		startButton.addMouseListener(new MouseAdapter() {

+

+

+

+			@Override

+			public void mouseUp(MouseEvent e) {

+				if (!Platform.inDebugMode()) {

+					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Debug mode", "You must activate debug mode to be able to use this view. ");

+				}

+

+				// Dirty work to force the NullElementType edithelper if in debug mode

+				if (Platform.inDebugMode()) {

+

+					Field nullElementTypeEditHelperField = ElementTypeRegistryUtils.getNullElementTypeEditHelper();

+

+					if (nullElementTypeEditHelperField != null) {

+						// Register fake

+

+						try {

+							nullElementTypeEditHelperField.set(NullElementType.getInstance(), new NotifierNullEditHelper());

+						} catch (IllegalArgumentException e1) {

+							// TODO Auto-generated catch block

+							e1.printStackTrace();

+						} catch (IllegalAccessException e1) {

+							// TODO Auto-generated catch block

+							e1.printStackTrace();

+						}

+					} else {

+						Activator.log.warn("Failed to override NullElementType's EditHelper");

+					}

+

+					MessageDialog.openInformation(Display.getCurrent().getActiveShell(), "Debug mode", "Be careful, as the platform is in debug mode, the NullElementType's EditHelper has been overriden");

+				}

+

+				if (listener == null) {

+					listener = new ITypesEventsChainListener() {

+

+						@Override

+						public void notifyChain(TypesEventsChain chain) {

+							int limit;

+							String text = limitText.getText();

+							try {

+								limit = Integer.parseInt(text);

+							} catch (NumberFormatException e) {

+								limit = MAX_SIZE;

+							}

+							if (eventsChains.size() >= limit) {

+								eventsChains.remove(0);

+							}

+							eventsChains.add(chain);

+							Display.getCurrent().asyncExec(new Runnable() {

+								@Override

+								public void run() {

+									tree.getViewer().refresh();

+								}

+							});

+

+						}

+					};

+					TypesListenersRegistry.getInstance().addEventChainListener(listener);

+				}

+			}

+

+		});

+		startButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+

+		Button stopButton = new Button(parent, SWT.NONE);

+		stopButton.setText("Stop");

+		stopButton.addMouseListener(new MouseAdapter() {

+

+			@Override

+			public void mouseUp(MouseEvent e) {

+				TypesListenersRegistry.getInstance().removeEventChainListener(listener);

+				listener = null;

+			}

+

+		});

+		stopButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+

+		Button clearButton = new Button(parent, SWT.NONE);

+		clearButton.setText("Clear");

+		clearButton.addMouseListener(new MouseAdapter() {

+

+			@Override

+			public void mouseUp(MouseEvent e) {

+				eventsChains.clear();

+				tree.getViewer().refresh();

+				browser.setText("");

+			}

+

+		});

+		clearButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+

+		Label label = new Label(parent, SWT.NONE);

+		label.setText("Limit: ");

+

+		limitText = new Text(parent, SWT.BORDER);

+		limitText.setText(MAX_SIZE + "");

+		limitText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));

+

+		sash = new SashForm(parent, SWT.HORIZONTAL | SWT.BORDER);

+

+		sash.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));

+

+		tree = new FilteredTree(sash, SWT.BORDER, new PatternFilter(), true);

+		tree.getViewer().setLabelProvider(new TypesEventLabelProvider());

+		tree.getViewer().setContentProvider(new TypesEventContentProvider());

+		tree.getViewer().addSelectionChangedListener(new ISelectionChangedListener() {

+

+			@Override

+			public void selectionChanged(SelectionChangedEvent event) {

+				if (event.getSelection() instanceof IStructuredSelection) {

+					Object first = ((IStructuredSelection) event.getSelection()).getFirstElement();

+					String result = "";

+					if (first instanceof ITypesEvent) {

+

+						Map<String, String> details = TypesEventPrinter.getEventDetails(((ITypesEvent) first));

+						result = TypesEventPrinter.printHtmlEvent(details);

+					} else if (first instanceof TypesEventsChain) {

+						IEditCommandRequest req = ((TypesEventsChain) first).getRequest();

+						result = TypesEventPrinter.printHtmRequest(req);

+					}

+					browser.setText(result);

+				}

+

+			}

+		});

+		tree.getViewer().setInput(eventsChains);

+

+		browser = new Browser(sash, SWT.NONE);

+

+

+		sash.setWeights(new int[] { 1, 3 });

+	}

+

+

+

+	@Override

+	public void setFocus() {

+

+	}

+

+	/**

+	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()

+	 *

+	 */

+	@Override

+	public void dispose() {

+		TypesListenersRegistry.getInstance().removeEventChainListener(listener);

+		super.dispose();

+	}

+

+

+}

diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/.gitignore b/plugins/developer/org.eclipse.papyrus.dev.types/xtend-gen/.gitignore
index 1c31bab9945..1c31bab9945 100644
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/xtend-gen/.gitignore
+++ b/plugins/developer/org.eclipse.papyrus.dev.types/xtend-gen/.gitignore
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.core.resources.prefs b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9c8f702e54e..00000000000
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/elementtypesconfigurations/developer/generator/ElementTypeRegistryGenerator.xtend=ISO-8859-1
diff --git a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/handlers/MigrateElementTypesConfigurations.java b/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/handlers/MigrateElementTypesConfigurations.java
deleted file mode 100644
index 2bb3b935828..00000000000
--- a/plugins/developer/org.eclipse.papyrus.elementtypesconfigurations.developer/src/org/eclipse/papyrus/elementtypesconfigurations/developer/handlers/MigrateElementTypesConfigurations.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.elementtypesconfigurations.developer.handlers;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Iterator;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public class MigrateElementTypesConfigurations extends AbstractHandler {
-
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-
-		final String FILE_EXTENSION = "elementtypesconfigurations";
-
-		final String ELEMENTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:elementtypesconfigurations";
-		final String ELEMENTTYPECONFIGURATION_NAMESPACE_OLD = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0";
-		final String ELEMENTTYPECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1";
-
-		final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:applystereotypeadviceconfiguration";
-		final String APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1";
-
-		final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:invariantstereotyperuleconfiguration";
-		final String INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1";
-
-		final String SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:settypeadviceconfiguration";
-		final String SETTYPEADVICECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1";
-
-		final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:stereotypeapplicationmatcherconfiguration";
-		final String STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1";
-
-		final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:invariantcontainerruleconfiguration";
-		final String INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1";
-
-		final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:runtimevalueseditionadviceconfiguration";
-		final String RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1";
-
-		final String SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:setvaluesadviceconfiguration";
-		final String SETVALUESADVICECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1";
-
-		final String INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE = "xmlns:invarianttypeconfiguration";
-		final String INVARIANTTYPECONFIGURATION_NAMESPACE_NEW = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1";
-
-
-
-		final String TYPE_ATTRIBUTE = "xsi:type";
-		final String EDITHELPERADVICECONFIGURATION_TAG = "editHelperAdviceConfiguration";
-		final String MATCHERCONFIGURATION_TAG = "matcherConfiguration";
-		final String NAME_ATTRIBUTE = "name";
-		final String IDENTIFIER_ATTRIBUTE = "identifier";
-		final String EDITHELPERADVICECLASSNAME_ATTRIBUTE = "editHelperAdviceClassName";
-		final String ADVICEBINDINGSCONFIGURATIONS_TAG = "adviceBindingsConfigurations";
-		final String MATCHER_TYPE = "elementtypesconfigurations:MatcherConfiguration";
-		final String ADVICEBINDINGCONFIGURATION_TYPE = "elementtypesconfigurations:AdviceBindingConfiguration";
-		final String EDITHELPERADVICECONFIGURATION_TYPE = "elementtypesconfigurations:EditHelperAdviceConfiguration";
-		final String MATCHERCLASSNAME_ATTRIBUTE = "matcherClassName";
-
-
-		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-		if (!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {
-			return null;
-		}
-
-		final IStructuredSelection selection = (IStructuredSelection) currentSelection;
-
-		Iterator<?> it = selection.iterator();
-
-		while (it.hasNext()) {
-			Object selectedElement = (Object) it.next();
-
-			if (selectedElement instanceof IFile) {
-				if (FILE_EXTENSION.equals(((IFile) selectedElement).getFileExtension())) {
-					IFile selectedFile = ((IFile) selectedElement);
-					URI uri = selectedFile.getLocationURI();
-
-					if (selectedFile.isLinked()) {
-						uri = selectedFile.getRawLocationURI();
-					}
-
-					try {
-						File file = EFS.getStore(uri).toLocalFile(0, new NullProgressMonitor());
-						DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-						DocumentBuilder builder = factory.newDocumentBuilder();
-						Document doc = builder.parse(file);
-						Element root = doc.getDocumentElement();
-
-						if (root.getAttribute(ELEMENTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE).equals(ELEMENTTYPECONFIGURATION_NAMESPACE_OLD)) {
-
-							// Update namespaces
-							root.setAttribute(ELEMENTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE, ELEMENTTYPECONFIGURATION_NAMESPACE_NEW);
-
-							if (!root.getAttribute(APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE, APPLYSTEREOTYPEADVICECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_ATTRIBUTE, INVARIANTSTEREOTYPERULECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(SETTYPEADVICECONFIGURATION_NAMESPACE_ATTRIBUTE, SETTYPEADVICECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_ATTRIBUTE, STEREOTYPEAPPLICATIONMATCHERCONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_ATTRIBUTE, INVARIANTCONTAINERRULECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_ATTRIBUTE, RUNTIMEVALUESEDITIONADVICECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(SETVALUESADVICECONFIGURATION_NAMESPACE_ATTRIBUTE, SETVALUESADVICECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							if (!root.getAttribute(INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE).isEmpty()) {
-								root.setAttribute(INVARIANTTYPECONFIGURATION_NAMESPACE_ATTRIBUTE, INVARIANTTYPECONFIGURATION_NAMESPACE_NEW);
-							}
-
-							NodeList editHelperAdviceConfigurations = root.getElementsByTagName(EDITHELPERADVICECONFIGURATION_TAG);
-
-							for (int i = 0; i < editHelperAdviceConfigurations.getLength(); i++) {
-								Element editHelperAdvice = (Element) editHelperAdviceConfigurations.item(i);
-
-								Node type = editHelperAdvice.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
-
-								if (type == null) {
-									editHelperAdvice.setAttribute(TYPE_ATTRIBUTE, EDITHELPERADVICECONFIGURATION_TYPE);
-								} else if (!type.getNodeValue().equals(EDITHELPERADVICECONFIGURATION_TYPE)) {
-									editHelperAdvice.removeAttribute(EDITHELPERADVICECLASSNAME_ATTRIBUTE);
-								}
-
-								editHelperAdvice.removeAttribute(NAME_ATTRIBUTE);
-								editHelperAdvice.removeAttribute(IDENTIFIER_ATTRIBUTE);
-							}
-
-							NodeList adviceBindingsConfigurations = root.getElementsByTagName(ADVICEBINDINGSCONFIGURATIONS_TAG);
-
-							for (int i = 0; i < adviceBindingsConfigurations.getLength(); i++) {
-								Element adviceBinding = (Element) adviceBindingsConfigurations.item(i);
-
-								Node type = adviceBinding.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
-
-								if (type == null) {
-									adviceBinding.setAttribute(TYPE_ATTRIBUTE, ADVICEBINDINGCONFIGURATION_TYPE);
-								} else if (!type.getNodeValue().equals(ADVICEBINDINGCONFIGURATION_TYPE)) {
-									adviceBinding.removeAttribute(EDITHELPERADVICECLASSNAME_ATTRIBUTE);
-								}
-
-								adviceBinding.removeAttribute(NAME_ATTRIBUTE);
-							}
-
-							NodeList matcherConfigurations = root.getElementsByTagName(MATCHERCONFIGURATION_TAG);
-
-							for (int i = 0; i < matcherConfigurations.getLength(); i++) {
-								Element matcher = (Element) matcherConfigurations.item(i);
-
-								Node type = matcher.getAttributes().getNamedItem(TYPE_ATTRIBUTE);
-
-								if (type == null) {
-									matcher.setAttribute(TYPE_ATTRIBUTE, MATCHER_TYPE);
-								} else {
-									matcher.removeAttribute(MATCHERCLASSNAME_ATTRIBUTE);
-								}
-							}
-
-							Transformer transformer = TransformerFactory.newInstance().newTransformer();
-							Result output = new StreamResult(file);
-							Source input = new DOMSource(doc);
-
-							transformer.transform(input, output);
-						}
-
-					} catch (ParserConfigurationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (SAXException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (IOException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (TransformerConfigurationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (TransformerFactoryConfigurationError e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (TransformerException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-
-				}
-			}
-
-		}
-		return null;
-	}
-
-
-
-
-
-}
diff --git a/plugins/developer/pom.xml b/plugins/developer/pom.xml
index 73a40b33457..fbaed18eebc 100644
--- a/plugins/developer/pom.xml
+++ b/plugins/developer/pom.xml
@@ -23,13 +23,13 @@
 		<module>org.eclipse.papyrus.dev.project.management</module>
 		<module>org.eclipse.papyrus.dev.tests.framework</module>
 		<module>org.eclipse.papyrus.dev.tests.framework.ui</module>
+		<module>org.eclipse.papyrus.dev.types</module>
 		<module>org.eclipse.papyrus.dev.view.services.edit.request</module>
 		<module>org.eclipse.papyrus.developer.profile</module>
 		<module>org.eclipse.papyrus.domaincodegen.ui</module>
 		<module>org.eclipse.papyrus.domaincontextcodegen</module>
 		<module>org.eclipse.papyrus.domaincontextcodegen.edit</module>
 		<module>org.eclipse.papyrus.domaincontextcodegen.editor</module>
-		<module>org.eclipse.papyrus.elementtypesconfigurations.developer</module>
 		<module>org.eclipse.papyrus.gmf.editpartview</module>
 		<module>org.eclipse.papyrus.gmf.editpoliciesstates</module>
 		<module>org.eclipse.papyrus.gmf.figureview</module>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.classpath
index e7a4ca0c29c..e7a4ca0c29c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.classpath
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.project
index ef104cfc383..739a883bc87 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.project
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.uml.elementtypesconfigurations</name>
+	<name>org.eclipse.papyrus.infra.emf.types.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca8..0c68a61dca8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f1b58b7d9dd
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types.ui;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceEditPlugin$Implementation
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,
+ org.eclipse.papyrus.infra.types;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.edit;visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
+ org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-Vendor: %providerName
+Export-Package: org.eclipse.papyrus.infra.emf.types.internal.ui,
+ org.eclipse.papyrus.infra.emf.types.internal.ui.advice,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider,
+ org.eclipse.papyrus.infra.emf.types.ui.advices.values.util
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties
index 1411453014c..1411453014c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/build.properties
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesAdviceConfiguration.gif
new file mode 100644
index 00000000000..64eb22ea49a
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
index a149010ace4..a149010ace4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateRuntimeValuesAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateRuntimeValuesAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
new file mode 100644
index 00000000000..ed8ee387a3c
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateRuntimeValuesAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
index 1d24f793204..1d24f793204 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/RuntimeValuesAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/RuntimeValuesAdviceConfiguration.gif
new file mode 100644
index 00000000000..7c2aaac84ee
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/RuntimeValuesAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif
index 48e3cf22687..48e3cf22687 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/obj16/ViewToDisplay.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/ViewToDisplay.gif
index 83afb9b3c9a..83afb9b3c9a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/icons/full/obj16/ViewToDisplay.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/icons/full/obj16/ViewToDisplay.gif
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore
new file mode 100644
index 00000000000..7073ae33223
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.ecore
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="values" nsURI="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"

+    nsPrefix="runtimevaluesadvice">

+  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"

+        eType="#//ViewToDisplay" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass ../../org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel
new file mode 100644
index 00000000000..7c48ba89669
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/model/RuntimeValuesAdvice.genmodel
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.emf.types.ui/src-gen"

+    editDirectory="/org.eclipse.papyrus.infra.emf.types.ui/src-gen" editorDirectory="/org.eclipse.papyrus.infra.emf.types.ui.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.infra.emf.types.ui" modelName="RuntimeValuesAdvice"

+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>RuntimeValuesAdvice.ecore</foreignModel>

+  <genPackages prefix="RuntimeValuesAdvice" basePackage="org.eclipse.papyrus.infra.emf.types.ui.advices"

+      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"

+      ecorePackage="RuntimeValuesAdvice.ecore#/">

+    <genClasses ecoreClass="RuntimeValuesAdvice.ecore#//RuntimeValuesAdviceConfiguration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesAdvice.ecore#//RuntimeValuesAdviceConfiguration/viewsToDisplay"/>

+    </genClasses>

+    <genClasses ecoreClass="RuntimeValuesAdvice.ecore#//ViewToDisplay">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesAdvice.ecore#//ViewToDisplay/view"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
index 36074245c9a..99226082a20 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.properties
@@ -1,23 +1,23 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = UI for EMF ElementTypesConfigurations Model
-providerName = Eclipse Modeling Project
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
_UI_PropertyDescriptor_description = The {0} of the {1}
-
_UI_RuntimeValuesEditionAdviceConfiguration_type = Runtime Values Edition Advice Configuration
-_UI_ViewToDisplay_type = View To Display
-_UI_Unknown_type = Object
-
_UI_Unknown_datatype= Value
-
_UI_RuntimeValuesEditionAdviceConfiguration_viewsToDisplay_feature = Views To Display
-_UI_ViewToDisplay_view_feature = View
-_UI_Unknown_feature = Unspecified
+

+# <copyright>

+# </copyright>

+#

+# $Id$

+

+pluginName = UI for EMF TypesConfigurations Model

+providerName = Eclipse Modeling Project

+_UI_CreateChild_text = {0}

+_UI_CreateChild_text2 = {1} {0}

+_UI_CreateChild_text3 = {1}

+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

+
_UI_PropertyDescriptor_description = The {0} of the {1}

+
_UI_RuntimeValuesAdviceConfiguration_type = Runtime Values Advice Configuration

+_UI_ViewToDisplay_type = View To Display

+_UI_Unknown_type = Object

+
_UI_Unknown_datatype= Value

+
_UI_RuntimeValuesAdviceConfiguration_viewsToDisplay_feature = Views To Display

+_UI_ViewToDisplay_view_feature = View

+_UI_Unknown_feature = Unspecified

 
\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.xml
new file mode 100644
index 00000000000..869987f1c49
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/plugin.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+
+
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated RuntimeValuesAdvice -->
+      <package
+            uri="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage"
+            genModel="model/RuntimeValuesAdvice.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated RuntimeValuesAdvice -->
+      <parser
+            type="runtimevaluesadvice"
+            class="org.eclipse.papyrus.infra.emf.types.ui.advices.values.util.RuntimeValuesAdviceResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated RuntimeValuesAdvice -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.childCreationExtenders">
+      <!-- @generated RuntimeValuesAdvice -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider.RuntimeValuesAdviceItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>
+   </extension>
+
+   <extension
+         point="org.eclipse.papyrus.infra.types.core.adviceConfigurationKind">
+      <adviceConfigurationKind
+            configurationClass="org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration"
+            factoryClass="org.eclipse.papyrus.infra.emf.types.internal.ui.advice.RuntimeValuesAdviceEditHelperAdviceFactory">
+      </adviceConfigurationKind>
+   </extension>
+
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml
index ad940a8e9dd..d7e09280b23 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/pom.xml
@@ -2,11 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations</artifactId>
+	<artifactId>org.eclipse.papyrus.infra.emf.types.ui</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdviceConfiguration.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdviceConfiguration.java
new file mode 100644
index 00000000000..ac4983da6a7
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdviceConfiguration.java
@@ -0,0 +1,42 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration#getViewsToDisplay <em>Views To Display</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage#getRuntimeValuesAdviceConfiguration()
+ * @model
+ * @generated
+ */
+public interface RuntimeValuesAdviceConfiguration extends AbstractAdviceBindingConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Views To Display</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Views To Display</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Views To Display</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage#getRuntimeValuesAdviceConfiguration_ViewsToDisplay()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ViewToDisplay> getViewsToDisplay();
+
+} // RuntimeValuesAdviceConfiguration
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdviceFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdviceFactory.java
new file mode 100644
index 00000000000..ff63a18c7ed
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdviceFactory.java
@@ -0,0 +1,51 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage
+ * @generated
+ */
+public interface RuntimeValuesAdviceFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RuntimeValuesAdviceFactory eINSTANCE = org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdviceFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Configuration</em>'.
+	 * @generated
+	 */
+	RuntimeValuesAdviceConfiguration createRuntimeValuesAdviceConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>View To Display</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>View To Display</em>'.
+	 * @generated
+	 */
+	ViewToDisplay createViewToDisplay();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	RuntimeValuesAdvicePackage getRuntimeValuesAdvicePackage();
+
+} //RuntimeValuesAdviceFactory
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java
new file mode 100644
index 00000000000..11ee1754367
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/RuntimeValuesAdvicePackage.java
@@ -0,0 +1,310 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface RuntimeValuesAdvicePackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "values";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "runtimevaluesadvice";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RuntimeValuesAdvicePackage eINSTANCE = org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdvicePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdviceConfigurationImpl <em>Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdvicePackageImpl#getRuntimeValuesAdviceConfiguration()
+	 * @generated
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__DESCRIPTION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Before</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__BEFORE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
+
+	/**
+	 * The feature id for the '<em><b>After</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__AFTER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__IDENTIFIER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__TARGET = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Inheritance</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__INHERITANCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
+
+	/**
+	 * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RUNTIME_VALUES_ADVICE_CONFIGURATION_OPERATION_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.ViewToDisplayImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdvicePackageImpl#getViewToDisplay()
+	 * @generated
+	 */
+	int VIEW_TO_DISPLAY = 1;
+
+	/**
+	 * The feature id for the '<em><b>View</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TO_DISPLAY__VIEW = 0;
+
+	/**
+	 * The number of structural features of the '<em>View To Display</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>View To Display</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VIEW_TO_DISPLAY_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration <em>Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration
+	 * @generated
+	 */
+	EClass getRuntimeValuesAdviceConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration#getViewsToDisplay <em>Views To Display</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Views To Display</em>'.
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration#getViewsToDisplay()
+	 * @see #getRuntimeValuesAdviceConfiguration()
+	 * @generated
+	 */
+	EReference getRuntimeValuesAdviceConfiguration_ViewsToDisplay();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay <em>View To Display</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>View To Display</em>'.
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay
+	 * @generated
+	 */
+	EClass getViewToDisplay();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay#getView <em>View</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>View</em>'.
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay#getView()
+	 * @see #getViewToDisplay()
+	 * @generated
+	 */
+	EReference getViewToDisplay_View();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	RuntimeValuesAdviceFactory getRuntimeValuesAdviceFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdviceConfigurationImpl <em>Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdvicePackageImpl#getRuntimeValuesAdviceConfiguration()
+		 * @generated
+		 */
+		EClass RUNTIME_VALUES_ADVICE_CONFIGURATION = eINSTANCE.getRuntimeValuesAdviceConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Views To Display</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY = eINSTANCE.getRuntimeValuesAdviceConfiguration_ViewsToDisplay();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.ViewToDisplayImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdvicePackageImpl#getViewToDisplay()
+		 * @generated
+		 */
+		EClass VIEW_TO_DISPLAY = eINSTANCE.getViewToDisplay();
+
+		/**
+		 * The meta object literal for the '<em><b>View</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference VIEW_TO_DISPLAY__VIEW = eINSTANCE.getViewToDisplay_View();
+
+	}
+
+} //RuntimeValuesAdvicePackage
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/ViewToDisplay.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/ViewToDisplay.java
new file mode 100644
index 00000000000..30c6ac8599c
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/ViewToDisplay.java
@@ -0,0 +1,52 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.papyrus.infra.properties.contexts.View;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>View To Display</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay#getView <em>View</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage#getViewToDisplay()
+ * @model
+ * @generated
+ */
+public interface ViewToDisplay extends EObject {
+	/**
+	 * Returns the value of the '<em><b>View</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>View</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>View</em>' reference.
+	 * @see #setView(View)
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage#getViewToDisplay_View()
+	 * @model required="true"
+	 * @generated
+	 */
+	View getView();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay#getView <em>View</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>View</em>' reference.
+	 * @see #getView()
+	 * @generated
+	 */
+	void setView(View value);
+
+} // ViewToDisplay
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdviceConfigurationImpl.java
index 0f9357692f0..0dec941a96d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimeValuesEditionAdviceConfigurationImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdviceConfigurationImpl.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl;
 
 import java.util.Collection;
 
@@ -24,26 +14,26 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl;
+import org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Runtime Values Edition Advice Configuration</b></em>'.
+ * An implementation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl#getViewsToDisplay <em>Views To Display</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.RuntimeValuesAdviceConfigurationImpl#getViewsToDisplay <em>Views To Display</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceBindingConfigurationImpl implements RuntimeValuesEditionAdviceConfiguration {
+public class RuntimeValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfigurationImpl implements RuntimeValuesAdviceConfiguration {
 	/**
 	 * The cached value of the '{@link #getViewsToDisplay() <em>Views To Display</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -59,7 +49,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected RuntimeValuesEditionAdviceConfigurationImpl() {
+	protected RuntimeValuesAdviceConfigurationImpl() {
 		super();
 	}
 
@@ -70,7 +60,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return RuntimevalueseditionadviceconfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION;
+		return RuntimeValuesAdvicePackage.Literals.RUNTIME_VALUES_ADVICE_CONFIGURATION;
 	}
 
 	/**
@@ -80,7 +70,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	 */
 	public EList<ViewToDisplay> getViewsToDisplay() {
 		if (viewsToDisplay == null) {
-			viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
+			viewsToDisplay = new EObjectContainmentEList<ViewToDisplay>(ViewToDisplay.class, this, RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
 		}
 		return viewsToDisplay;
 	}
@@ -93,7 +83,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
 				return ((InternalEList<?>)getViewsToDisplay()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -107,7 +97,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
 				return getViewsToDisplay();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -122,7 +112,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
 				getViewsToDisplay().clear();
 				getViewsToDisplay().addAll((Collection<? extends ViewToDisplay>)newValue);
 				return;
@@ -138,7 +128,7 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
 				getViewsToDisplay().clear();
 				return;
 		}
@@ -153,10 +143,10 @@ public class RuntimeValuesEditionAdviceConfigurationImpl extends AbstractAdviceB
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
 				return viewsToDisplay != null && !viewsToDisplay.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //RuntimeValuesEditionAdviceConfigurationImpl
+} //RuntimeValuesAdviceConfigurationImpl
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdviceFactoryImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdviceFactoryImpl.java
new file mode 100644
index 00000000000..fb8ae968eda
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdviceFactoryImpl.java
@@ -0,0 +1,106 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuntimeValuesAdviceFactoryImpl extends EFactoryImpl implements RuntimeValuesAdviceFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RuntimeValuesAdviceFactory init() {
+		try {
+			RuntimeValuesAdviceFactory theRuntimeValuesAdviceFactory = (RuntimeValuesAdviceFactory)EPackage.Registry.INSTANCE.getEFactory(RuntimeValuesAdvicePackage.eNS_URI);
+			if (theRuntimeValuesAdviceFactory != null) {
+				return theRuntimeValuesAdviceFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RuntimeValuesAdviceFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuntimeValuesAdviceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION: return createRuntimeValuesAdviceConfiguration();
+			case RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY: return createViewToDisplay();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuntimeValuesAdviceConfiguration createRuntimeValuesAdviceConfiguration() {
+		RuntimeValuesAdviceConfigurationImpl runtimeValuesAdviceConfiguration = new RuntimeValuesAdviceConfigurationImpl();
+		return runtimeValuesAdviceConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ViewToDisplay createViewToDisplay() {
+		ViewToDisplayImpl viewToDisplay = new ViewToDisplayImpl();
+		return viewToDisplay;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuntimeValuesAdvicePackage getRuntimeValuesAdvicePackage() {
+		return (RuntimeValuesAdvicePackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static RuntimeValuesAdvicePackage getPackage() {
+		return RuntimeValuesAdvicePackage.eINSTANCE;
+	}
+
+} //RuntimeValuesAdviceFactoryImpl
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdvicePackageImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdvicePackageImpl.java
new file mode 100644
index 00000000000..79bf7028053
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/RuntimeValuesAdvicePackageImpl.java
@@ -0,0 +1,228 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceFactory;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay;
+
+import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;
+
+import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage;
+
+import org.eclipse.papyrus.infra.properties.ui.UiPackage;
+
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuntimeValuesAdvicePackageImpl extends EPackageImpl implements RuntimeValuesAdvicePackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass runtimeValuesAdviceConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass viewToDisplayEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private RuntimeValuesAdvicePackageImpl() {
+		super(eNS_URI, RuntimeValuesAdviceFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link RuntimeValuesAdvicePackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static RuntimeValuesAdvicePackage init() {
+		if (isInited) return (RuntimeValuesAdvicePackage)EPackage.Registry.INSTANCE.getEPackage(RuntimeValuesAdvicePackage.eNS_URI);
+
+		// Obtain or create and register package
+		RuntimeValuesAdvicePackageImpl theRuntimeValuesAdvicePackage = (RuntimeValuesAdvicePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimeValuesAdvicePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RuntimeValuesAdvicePackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+		EnvironmentPackage.eINSTANCE.eClass();
+		ContextsPackage.eINSTANCE.eClass();
+		UiPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theRuntimeValuesAdvicePackage.createPackageContents();
+
+		// Initialize created meta-data
+		theRuntimeValuesAdvicePackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theRuntimeValuesAdvicePackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(RuntimeValuesAdvicePackage.eNS_URI, theRuntimeValuesAdvicePackage);
+		return theRuntimeValuesAdvicePackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRuntimeValuesAdviceConfiguration() {
+		return runtimeValuesAdviceConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRuntimeValuesAdviceConfiguration_ViewsToDisplay() {
+		return (EReference)runtimeValuesAdviceConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getViewToDisplay() {
+		return viewToDisplayEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getViewToDisplay_View() {
+		return (EReference)viewToDisplayEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuntimeValuesAdviceFactory getRuntimeValuesAdviceFactory() {
+		return (RuntimeValuesAdviceFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		runtimeValuesAdviceConfigurationEClass = createEClass(RUNTIME_VALUES_ADVICE_CONFIGURATION);
+		createEReference(runtimeValuesAdviceConfigurationEClass, RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
+
+		viewToDisplayEClass = createEClass(VIEW_TO_DISPLAY);
+		createEReference(viewToDisplayEClass, VIEW_TO_DISPLAY__VIEW);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
+		ContextsPackage theContextsPackage = (ContextsPackage)EPackage.Registry.INSTANCE.getEPackage(ContextsPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		runtimeValuesAdviceConfigurationEClass.getESuperTypes().add(theElementTypesConfigurationsPackage.getAbstractAdviceBindingConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(runtimeValuesAdviceConfigurationEClass, RuntimeValuesAdviceConfiguration.class, "RuntimeValuesAdviceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRuntimeValuesAdviceConfiguration_ViewsToDisplay(), this.getViewToDisplay(), null, "viewsToDisplay", null, 0, -1, RuntimeValuesAdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(viewToDisplayEClass, ViewToDisplay.class, "ViewToDisplay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getViewToDisplay_View(), theContextsPackage.getView(), null, "view", null, 1, 1, ViewToDisplay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //RuntimeValuesAdvicePackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/ViewToDisplayImpl.java
index 379088d5769..76f088638c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/ViewToDisplayImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/impl/ViewToDisplayImpl.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,10 +8,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay;
 
 import org.eclipse.papyrus.infra.properties.contexts.View;
 
@@ -33,12 +23,12 @@ import org.eclipse.papyrus.infra.properties.contexts.View;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl#getView <em>View</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.impl.ViewToDisplayImpl#getView <em>View</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
+public class ViewToDisplayImpl extends MinimalEObjectImpl.Container implements ViewToDisplay {
 	/**
 	 * The cached value of the '{@link #getView() <em>View</em>}' reference.
 	 * <!-- begin-user-doc -->
@@ -65,7 +55,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return RuntimevalueseditionadviceconfigurationPackage.Literals.VIEW_TO_DISPLAY;
+		return RuntimeValuesAdvicePackage.Literals.VIEW_TO_DISPLAY;
 	}
 
 	/**
@@ -79,7 +69,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 			view = (View)eResolveProxy(oldView);
 			if (view != oldView) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
 			}
 		}
 		return view;
@@ -103,7 +93,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 		View oldView = view;
 		view = newView;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
+			eNotify(new ENotificationImpl(this, Notification.SET, RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY__VIEW, oldView, view));
 	}
 
 	/**
@@ -114,7 +104,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			case RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY__VIEW:
 				if (resolve) return getView();
 				return basicGetView();
 		}
@@ -129,7 +119,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			case RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY__VIEW:
 				setView((View)newValue);
 				return;
 		}
@@ -144,7 +134,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			case RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY__VIEW:
 				setView((View)null);
 				return;
 		}
@@ -159,7 +149,7 @@ public class ViewToDisplayImpl extends EObjectImpl implements ViewToDisplay {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY__VIEW:
+			case RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY__VIEW:
 				return view != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/RuntimeValuesAdviceConfigurationItemProvider.java
index bfb8de18d47..df2864491ac 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/RuntimeValuesAdviceConfigurationItemProvider.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider;
 
 
 import java.util.Collection;
@@ -26,28 +16,26 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceFactory;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractAdviceBindingConfigurationItemProvider;
+import org.eclipse.papyrus.infra.types.provider.AbstractAdviceBindingConfigurationItemProvider;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class RuntimeValuesEditionAdviceConfigurationItemProvider extends AbstractAdviceBindingConfigurationItemProvider {
+public class RuntimeValuesAdviceConfigurationItemProvider extends AbstractAdviceBindingConfigurationItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public RuntimeValuesEditionAdviceConfigurationItemProvider(AdapterFactory adapterFactory) {
+	public RuntimeValuesAdviceConfigurationItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -78,7 +66,7 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends Abstrac
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(RuntimevalueseditionadviceconfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
+			childrenFeatures.add(RuntimeValuesAdvicePackage.Literals.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
 		}
 		return childrenFeatures;
 	}
@@ -97,14 +85,14 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends Abstrac
 	}
 
 	/**
-	 * This returns RuntimeValuesEditionAdviceConfiguration.gif.
+	 * This returns RuntimeValuesAdviceConfiguration.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RuntimeValuesEditionAdviceConfiguration"));
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RuntimeValuesAdviceConfiguration"));
 	}
 
 	/**
@@ -115,10 +103,10 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends Abstrac
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((RuntimeValuesEditionAdviceConfiguration)object).getDescription();
+		String label = ((RuntimeValuesAdviceConfiguration)object).getDescription();
 		return label == null || label.length() == 0 ?
-			getString("_UI_RuntimeValuesEditionAdviceConfiguration_type") :
-			getString("_UI_RuntimeValuesEditionAdviceConfiguration_type") + " " + label;
+			getString("_UI_RuntimeValuesAdviceConfiguration_type") :
+			getString("_UI_RuntimeValuesAdviceConfiguration_type") + " " + label;
 	}
 	
 
@@ -133,8 +121,8 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends Abstrac
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(RuntimeValuesEditionAdviceConfiguration.class)) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
+		switch (notification.getFeatureID(RuntimeValuesAdviceConfiguration.class)) {
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -154,8 +142,8 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends Abstrac
 
 		newChildDescriptors.add
 			(createChildParameter
-				(RuntimevalueseditionadviceconfigurationPackage.Literals.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY,
-				 RuntimevalueseditionadviceconfigurationFactory.eINSTANCE.createViewToDisplay()));
+				(RuntimeValuesAdvicePackage.Literals.RUNTIME_VALUES_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY,
+				 RuntimeValuesAdviceFactory.eINSTANCE.createViewToDisplay()));
 	}
 
 	/**
@@ -166,7 +154,7 @@ public class RuntimeValuesEditionAdviceConfigurationItemProvider extends Abstrac
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return RuntimeValuesEditionAdviceConfigurationEditPlugin.INSTANCE;
+		return RuntimeValuesAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/RuntimeValuesAdviceEditPlugin.java
index 816bcb7c5f7..9fd03a36366 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/RuntimeValuesAdviceEditPlugin.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -20,24 +10,24 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
 import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
-
 import org.eclipse.papyrus.infra.properties.environment.provider.PropertiesEditPlugin;
 
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
 /**
- * This is the central singleton for the RuntimeValuesEditionAdviceConfiguration edit plugin.
+ * This is the central singleton for the RuntimeValuesAdvice edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public final class RuntimeValuesEditionAdviceConfigurationEditPlugin extends EMFPlugin {
+public final class RuntimeValuesAdviceEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final RuntimeValuesEditionAdviceConfigurationEditPlugin INSTANCE = new RuntimeValuesEditionAdviceConfigurationEditPlugin();
+	public static final RuntimeValuesAdviceEditPlugin INSTANCE = new RuntimeValuesAdviceEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -53,12 +43,12 @@ public final class RuntimeValuesEditionAdviceConfigurationEditPlugin extends EMF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public RuntimeValuesEditionAdviceConfigurationEditPlugin() {
+	public RuntimeValuesAdviceEditPlugin() {
 		super
 		  (new ResourceLocator [] {
 		     ConstraintsEditPlugin.INSTANCE,
 		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
 		     PropertiesEditPlugin.INSTANCE,
 		   });
 	}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/provider/RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/RuntimeValuesAdviceItemProviderAdapterFactory.java
index ff3f43b59c4..c634a67360b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/provider/RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/RuntimeValuesAdviceItemProviderAdapterFactory.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,16 +31,14 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.util.RuntimeValuesAdviceAdapterFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationAdapterFactory;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsSwitch;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -61,7 +49,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.util.Elementtypescon
  * <!-- end-user-doc -->
  * @generated
  */
-public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory extends RuntimevalueseditionadviceconfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class RuntimeValuesAdviceItemProviderAdapterFactory extends RuntimeValuesAdviceAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -92,7 +80,7 @@ public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory e
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory() {
+	public RuntimeValuesAdviceItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -101,30 +89,30 @@ public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory e
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected RuntimeValuesEditionAdviceConfigurationItemProvider runtimeValuesEditionAdviceConfigurationItemProvider;
+	protected RuntimeValuesAdviceConfigurationItemProvider runtimeValuesAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public Adapter createRuntimeValuesEditionAdviceConfigurationAdapter() {
-		if (runtimeValuesEditionAdviceConfigurationItemProvider == null) {
-			runtimeValuesEditionAdviceConfigurationItemProvider = new RuntimeValuesEditionAdviceConfigurationItemProvider(this);
+	public Adapter createRuntimeValuesAdviceConfigurationAdapter() {
+		if (runtimeValuesAdviceConfigurationItemProvider == null) {
+			runtimeValuesAdviceConfigurationItemProvider = new RuntimeValuesAdviceConfigurationItemProvider(this);
 		}
 
-		return runtimeValuesEditionAdviceConfigurationItemProvider;
+		return runtimeValuesAdviceConfigurationItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -132,7 +120,7 @@ public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory e
 	protected ViewToDisplayItemProvider viewToDisplayItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -245,24 +233,24 @@ public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory e
 	 * @generated
 	 */
 	public void dispose() {
-		if (runtimeValuesEditionAdviceConfigurationItemProvider != null) runtimeValuesEditionAdviceConfigurationItemProvider.dispose();
+		if (runtimeValuesAdviceConfigurationItemProvider != null) runtimeValuesAdviceConfigurationItemProvider.dispose();
 		if (viewToDisplayItemProvider != null) viewToDisplayItemProvider.dispose();
 	}
 
 	/**
-	 * A child creation extender for the {@link ElementtypesconfigurationsPackage}.
+	 * A child creation extender for the {@link ElementTypesConfigurationsPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {
+	public static class ElementTypesConfigurationsChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {
+		protected static class CreationSwitch extends ElementTypesConfigurationsSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -298,8 +286,8 @@ public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory e
 			public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
-						 RuntimevalueseditionadviceconfigurationFactory.eINSTANCE.createRuntimeValuesEditionAdviceConfiguration()));
+						(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+						 RuntimeValuesAdviceFactory.eINSTANCE.createRuntimeValuesAdviceConfiguration()));
 
 				return null;
 			}
@@ -332,7 +320,7 @@ public class RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory e
 		 * @generated
 		 */
 		public ResourceLocator getResourceLocator() {
-			return RuntimeValuesEditionAdviceConfigurationEditPlugin.INSTANCE;
+			return RuntimeValuesAdviceEditPlugin.INSTANCE;
 		}
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/ViewToDisplayItemProvider.java
index 3f6168d5a87..39a8f4ddb74 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/provider/ViewToDisplayItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/provider/ViewToDisplayItemProvider.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.provider;
 
 
 import java.util.Collection;
@@ -30,12 +20,10 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -87,7 +75,7 @@ public class ViewToDisplayItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ViewToDisplay_view_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ViewToDisplay_view_feature", "_UI_ViewToDisplay_type"),
-				 RuntimevalueseditionadviceconfigurationPackage.Literals.VIEW_TO_DISPLAY__VIEW,
+				 RuntimeValuesAdvicePackage.Literals.VIEW_TO_DISPLAY__VIEW,
 				 true,
 				 false,
 				 true,
@@ -152,7 +140,7 @@ public class ViewToDisplayItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return RuntimeValuesEditionAdviceConfigurationEditPlugin.INSTANCE;
+		return RuntimeValuesAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceAdapterFactory.java
index 90ae44af366..050060ff121 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceAdapterFactory.java
@@ -1,16 +1,6 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,29 +9,29 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.*;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.*;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage
  * @generated
  */
-public class RuntimevalueseditionadviceconfigurationAdapterFactory extends AdapterFactoryImpl {
+public class RuntimeValuesAdviceAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static RuntimevalueseditionadviceconfigurationPackage modelPackage;
+	protected static RuntimeValuesAdvicePackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -49,9 +39,9 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public RuntimevalueseditionadviceconfigurationAdapterFactory() {
+	public RuntimeValuesAdviceAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = RuntimevalueseditionadviceconfigurationPackage.eINSTANCE;
+			modelPackage = RuntimeValuesAdvicePackage.eINSTANCE;
 		}
 	}
 
@@ -80,11 +70,11 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected RuntimevalueseditionadviceconfigurationSwitch<Adapter> modelSwitch =
-		new RuntimevalueseditionadviceconfigurationSwitch<Adapter>() {
+	protected RuntimeValuesAdviceSwitch<Adapter> modelSwitch =
+		new RuntimeValuesAdviceSwitch<Adapter>() {
 			@Override
-			public Adapter caseRuntimeValuesEditionAdviceConfiguration(RuntimeValuesEditionAdviceConfiguration object) {
-				return createRuntimeValuesEditionAdviceConfigurationAdapter();
+			public Adapter caseRuntimeValuesAdviceConfiguration(RuntimeValuesAdviceConfiguration object) {
+				return createRuntimeValuesAdviceConfigurationAdapter();
 			}
 			@Override
 			public Adapter caseViewToDisplay(ViewToDisplay object) {
@@ -127,27 +117,27 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration <em>Runtime Values Edition Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration
 	 * @generated
 	 */
-	public Adapter createRuntimeValuesEditionAdviceConfigurationAdapter() {
+	public Adapter createRuntimeValuesAdviceConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay <em>View To Display</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay <em>View To Display</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay
+	 * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay
 	 * @generated
 	 */
 	public Adapter createViewToDisplayAdapter() {
@@ -155,13 +145,13 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	public Adapter createConfigurationElementAdapter() {
@@ -169,13 +159,13 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration <em>Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration <em>Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createAdviceConfigurationAdapter() {
@@ -183,13 +173,13 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	public Adapter createIdentifiedConfigurationAdapter() {
@@ -197,13 +187,13 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractAdviceBindingConfigurationAdapter() {
@@ -222,4 +212,4 @@ public class RuntimevalueseditionadviceconfigurationAdapterFactory extends Adapt
 		return null;
 	}
 
-} //RuntimevalueseditionadviceconfigurationAdapterFactory
+} //RuntimeValuesAdviceAdapterFactory
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceResourceFactoryImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceResourceFactoryImpl.java
new file mode 100644
index 00000000000..a490eb19580
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceResourceFactoryImpl.java
@@ -0,0 +1,41 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.util.RuntimeValuesAdviceResourceImpl
+ * @generated
+ */
+public class RuntimeValuesAdviceResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuntimeValuesAdviceResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new RuntimeValuesAdviceResourceImpl(uri);
+		return result;
+	}
+
+} //RuntimeValuesAdviceResourceFactoryImpl
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceResourceImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceResourceImpl.java
new file mode 100644
index 00000000000..1caa7861994
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceResourceImpl.java
@@ -0,0 +1,28 @@
+/**
+ */
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.util.RuntimeValuesAdviceResourceFactoryImpl
+ * @generated
+ */
+public class RuntimeValuesAdviceResourceImpl extends XMIResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public RuntimeValuesAdviceResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} //RuntimeValuesAdviceResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationSwitch.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceSwitch.java
index 69a080c5d11..7ef4386df5c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationSwitch.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src-gen/org/eclipse/papyrus/infra/emf/types/ui/advices/values/util/RuntimeValuesAdviceSwitch.java
@@ -1,28 +1,18 @@
 /**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.ui.advices.values.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.*;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.*;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,17 +24,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalues
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdvicePackage
  * @generated
  */
-public class RuntimevalueseditionadviceconfigurationSwitch<T> extends Switch<T> {
+public class RuntimeValuesAdviceSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static RuntimevalueseditionadviceconfigurationPackage modelPackage;
+	protected static RuntimeValuesAdvicePackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -52,9 +42,9 @@ public class RuntimevalueseditionadviceconfigurationSwitch<T> extends Switch<T>
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public RuntimevalueseditionadviceconfigurationSwitch() {
+	public RuntimeValuesAdviceSwitch() {
 		if (modelPackage == null) {
-			modelPackage = RuntimevalueseditionadviceconfigurationPackage.eINSTANCE;
+			modelPackage = RuntimeValuesAdvicePackage.eINSTANCE;
 		}
 	}
 
@@ -81,17 +71,17 @@ public class RuntimevalueseditionadviceconfigurationSwitch<T> extends Switch<T>
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION: {
-				RuntimeValuesEditionAdviceConfiguration runtimeValuesEditionAdviceConfiguration = (RuntimeValuesEditionAdviceConfiguration)theEObject;
-				T result = caseRuntimeValuesEditionAdviceConfiguration(runtimeValuesEditionAdviceConfiguration);
-				if (result == null) result = caseAbstractAdviceBindingConfiguration(runtimeValuesEditionAdviceConfiguration);
-				if (result == null) result = caseAdviceConfiguration(runtimeValuesEditionAdviceConfiguration);
-				if (result == null) result = caseIdentifiedConfiguration(runtimeValuesEditionAdviceConfiguration);
-				if (result == null) result = caseConfigurationElement(runtimeValuesEditionAdviceConfiguration);
+			case RuntimeValuesAdvicePackage.RUNTIME_VALUES_ADVICE_CONFIGURATION: {
+				RuntimeValuesAdviceConfiguration runtimeValuesAdviceConfiguration = (RuntimeValuesAdviceConfiguration)theEObject;
+				T result = caseRuntimeValuesAdviceConfiguration(runtimeValuesAdviceConfiguration);
+				if (result == null) result = caseAbstractAdviceBindingConfiguration(runtimeValuesAdviceConfiguration);
+				if (result == null) result = caseAdviceConfiguration(runtimeValuesAdviceConfiguration);
+				if (result == null) result = caseIdentifiedConfiguration(runtimeValuesAdviceConfiguration);
+				if (result == null) result = caseConfigurationElement(runtimeValuesAdviceConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY: {
+			case RuntimeValuesAdvicePackage.VIEW_TO_DISPLAY: {
 				ViewToDisplay viewToDisplay = (ViewToDisplay)theEObject;
 				T result = caseViewToDisplay(viewToDisplay);
 				if (result == null) result = defaultCase(theEObject);
@@ -102,17 +92,17 @@ public class RuntimevalueseditionadviceconfigurationSwitch<T> extends Switch<T>
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Runtime Values Edition Advice Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Runtime Values Edition Advice Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseRuntimeValuesEditionAdviceConfiguration(RuntimeValuesEditionAdviceConfiguration object) {
+	public T caseRuntimeValuesAdviceConfiguration(RuntimeValuesAdviceConfiguration object) {
 		return null;
 	}
 
@@ -207,4 +197,4 @@ public class RuntimevalueseditionadviceconfigurationSwitch<T> extends Switch<T>
 		return null;
 	}
 
-} //RuntimevalueseditionadviceconfigurationSwitch
+} //RuntimeValuesAdviceSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/Activator.java
index 03d821e00f7..0d0ff50c279 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/Activator.java
@@ -1,50 +1,52 @@
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
+package org.eclipse.papyrus.infra.emf.types.internal.ui;

+

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle

+ */

+public class Activator extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types.ui"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdvice.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/advice/RuntimeValuesAdviceEditHelperAdvice.java
index e10663520fd..c03d4dbb34e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdvice.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/advice/RuntimeValuesAdviceEditHelperAdvice.java
@@ -1,137 +1,137 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay;
-import org.eclipse.papyrus.infra.properties.contexts.View;
-import org.eclipse.papyrus.infra.properties.ui.creation.EditionDialog;
-import org.eclipse.papyrus.infra.services.edit.utils.ElementTypeUtils;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * advice for the {@link SetValuesAdviceConfiguration}
- */
-public class RuntimeValuesEditionAdviceEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	/** list of views to display */
-	protected Set<View> viewsToDisplay;
-
-
-	/**
-	 * Default Constructor
-	 */
-	public RuntimeValuesEditionAdviceEditHelperAdvice(RuntimeValuesEditionAdviceConfiguration configuration) {
-		viewsToDisplay = new HashSet<View>();
-		for (ViewToDisplay display : configuration.getViewsToDisplay()) {
-			View view = display.getView();
-			if (view != null) {
-				viewsToDisplay.add(view);
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {
-		return super.getBeforeCreateCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		return super.getAfterCreateCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return super.getBeforeConfigureCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {
-		final EObject elementToConfigure = request.getElementToConfigure();
-		if (elementToConfigure == null) {
-			return null;
-		}
-
-		final boolean dialogCancellable = ElementTypeUtils.dialogCancellable(request);
-
-		return new AbstractTransactionalCommand(request.getEditingDomain(), "Editing " + EMFCoreUtil.getName(elementToConfigure), Collections.singletonList(WorkspaceSynchronizer.getFile((elementToConfigure.eResource())))) {
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				Set<View> viewsToDisplay = getViewsToDisplay();
-				if (!viewsToDisplay.isEmpty()) {
-					EditionDialog dialog = new EditionDialog(Display.getCurrent().getActiveShell(), dialogCancellable) {
-
-					};
-					dialog.setTitle("Edit " + EMFCoreUtil.getName(elementToConfigure));
-					dialog.setViews(viewsToDisplay);
-					dialog.setInput(elementToConfigure);
-
-					dialog.open();
-				}
-
-				return CommandResult.newOKCommandResult(elementToConfigure);
-			}
-		};
-
-	}
-
-
-	/**
-	 * @return the viewsToDisplay
-	 */
-	public Set<View> getViewsToDisplay() {
-		return viewsToDisplay;
-	}
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.emf.types.internal.ui.advice;

+

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.Set;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration;

+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.ViewToDisplay;

+import org.eclipse.papyrus.infra.properties.contexts.View;

+import org.eclipse.papyrus.infra.properties.ui.creation.EditionDialog;

+import org.eclipse.papyrus.infra.services.edit.utils.ElementTypeUtils;

+import org.eclipse.swt.widgets.Display;

+

+/**

+ * advice for the {@link SetValuesAdviceConfiguration}

+ */

+public class RuntimeValuesAdviceEditHelperAdvice extends AbstractEditHelperAdvice {

+

+	/** list of views to display */

+	protected Set<View> viewsToDisplay;

+

+

+	/**

+	 * Default Constructor

+	 */

+	public RuntimeValuesAdviceEditHelperAdvice(RuntimeValuesAdviceConfiguration configuration) {

+		viewsToDisplay = new HashSet<View>();

+		for (ViewToDisplay display : configuration.getViewsToDisplay()) {

+			View view = display.getView();

+			if (view != null) {

+				viewsToDisplay.add(view);

+			}

+		}

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public boolean approveRequest(IEditCommandRequest request) {

+		return super.approveRequest(request);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getBeforeCreateCommand(CreateElementRequest request) {

+		return super.getBeforeCreateCommand(request);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getAfterCreateCommand(CreateElementRequest request) {

+		return super.getAfterCreateCommand(request);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

+		return super.getBeforeConfigureCommand(request);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getAfterConfigureCommand(final ConfigureRequest request) {

+		final EObject elementToConfigure = request.getElementToConfigure();

+		if (elementToConfigure == null) {

+			return null;

+		}

+

+		final boolean dialogCancellable = ElementTypeUtils.dialogCancellable(request);

+

+		return new AbstractTransactionalCommand(request.getEditingDomain(), "Editing " + EMFCoreUtil.getName(elementToConfigure), Collections.singletonList(WorkspaceSynchronizer.getFile((elementToConfigure.eResource())))) {

+			/**

+			 * {@inheritDoc}

+			 */

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				Set<View> viewsToDisplay = getViewsToDisplay();

+				if (!viewsToDisplay.isEmpty()) {

+					EditionDialog dialog = new EditionDialog(Display.getCurrent().getActiveShell(), dialogCancellable) {

+

+					};

+					dialog.setTitle("Edit " + EMFCoreUtil.getName(elementToConfigure));

+					dialog.setViews(viewsToDisplay);

+					dialog.setInput(elementToConfigure);

+

+					dialog.open();

+				}

+

+				return CommandResult.newOKCommandResult(elementToConfigure);

+			}

+		};

+

+	}

+

+

+	/**

+	 * @return the viewsToDisplay

+	 */

+	public Set<View> getViewsToDisplay() {

+		return viewsToDisplay;

+	}

+

+}

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/advice/RuntimeValuesAdviceEditHelperAdviceFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/advice/RuntimeValuesAdviceEditHelperAdviceFactory.java
new file mode 100644
index 00000000000..33b652f727a
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui/src/org/eclipse/papyrus/infra/emf/types/internal/ui/advice/RuntimeValuesAdviceEditHelperAdviceFactory.java
@@ -0,0 +1,31 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.emf.types.internal.ui.advice;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.emf.types.ui.advices.values.RuntimeValuesAdviceConfiguration;

+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;

+import org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceBindingFactory;

+import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;

+

+public class RuntimeValuesAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {

+

+	@Override

+	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {

+		if (adviceConfiguration instanceof RuntimeValuesAdviceConfiguration) {

+			IEditHelperAdvice editHelperAdvice = new RuntimeValuesAdviceEditHelperAdvice((RuntimeValuesAdviceConfiguration) adviceConfiguration);

+			return editHelperAdvice;

+		}

+		return NullEditHelperAdvice.getInstance();

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.classpath b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.classpath
index 6a42377b56a..6a42377b56a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.classpath
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.classpath
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project
new file mode 100644
index 00000000000..6c62ecfe762
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.emf.types</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d56fcb5df95
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/META-INF/MANIFEST.MF
@@ -0,0 +1,43 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.papyrus.infra.types;visibility:=reexport,

+ org.eclipse.papyrus.infra.types.rulebased;visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints;visibility:=reexport,

+ org.eclipse.papyrus.infra.types;visibility:=reexport,

+ org.eclipse.uml2.uml;visibility:=reexport,

+ org.eclipse.uml2.types;visibility:=reexport,

+ org.eclipse.papyrus.infra.properties;visibility:=reexport,

+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.emf.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.uml2.uml.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

+ org.eclipse.core.databinding;bundle-version="1.4.1",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0"

+Export-Package: org.eclipse.papyrus.infra.emf.types,

+ org.eclipse.papyrus.infra.emf.types.advices.values,

+ org.eclipse.papyrus.infra.emf.types.advices.values.impl,

+ org.eclipse.papyrus.infra.emf.types.advices.values.provider,

+ org.eclipse.papyrus.infra.emf.types.advices.values.util,

+ org.eclipse.papyrus.infra.emf.types.converter,

+ org.eclipse.papyrus.infra.emf.types.rules.container,

+ org.eclipse.papyrus.infra.emf.types.rules.container.impl,

+ org.eclipse.papyrus.infra.emf.types.rules.container.provider,

+ org.eclipse.papyrus.infra.emf.types.rules.container.util

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.emf.types.rules.container.provider.InvariantContainerRuleEditPlugin$Implementation

+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.types;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/about.html b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/about.html
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
index e7dfb48857d..130a42b93dc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/build.properties
@@ -1,4 +1,5 @@
-# Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

+# Copyright (c) 2014 CEA LIST.

+# 

 # 

 # All rights reserved. This program and the accompanying materials

 # are made available under the terms of the Eclipse Public License v1.0

@@ -7,19 +8,13 @@
 # 

 # Contributors:

 #  CEA LIST - Initial API and implementation

-#  Christian W. Damus - bug 451230

-#

 

-output..=bin/

 bin.includes = .,\

-               model/,\

+               icons/,\

                META-INF/,\

                plugin.xml,\

-               plugin.properties,\

-               icons/,\

-               about.html

-jars.compile.order=.

+               plugin.properties

+jars.compile.order = .

 source.. = src-gen/,\

-           src/

-bin..=bin/

-src.includes = about.html

+               src/

+output.. = bin/

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/Values.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/Values.gif
index f1f019535ea..f1f019535ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/Values.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/Values.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
index 889f3af917f..889f3af917f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
new file mode 100644
index 00000000000..fdd9def4faa
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
index dac4138ca01..dac4138ca01 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
index 755e4ca7a46..755e4ca7a46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
index fe708946d58..fe708946d58 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
index 44afafd55da..44afafd55da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
index f93c92d061a..f93c92d061a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
index 5ef9a94e8da..5ef9a94e8da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
index bbf242da6a9..bbf242da6a9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
index f08356ef9bb..f08356ef9bb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
index 37dad615792..37dad615792 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
index 33e07420851..33e07420851 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
index e180c4cf7ca..e180c4cf7ca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
index a149010ace4..a149010ace4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_RuntimeValuesEditionAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesActionConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesActionConfiguration.gif
index 1cbba050ada..1cbba050ada 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesActionConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesActionConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesAdviceConfiguration.gif
index a3f9e7cf231..a3f9e7cf231 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesAdviceConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetValuesAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
index 03366e35d0f..03366e35d0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
index 8997497557c..8997497557c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
index c048169804a..c048169804a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif
index 7ca3215e5f4..7ca3215e5f4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
index ca9cabaa91c..ca9cabaa91c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateListValue_values_ConstantValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateListValue_values_ConstantValue.gif
index fdf618977f6..fdf618977f6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateListValue_values_ConstantValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateListValue_values_ConstantValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateListValue_values_ListValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateListValue_values_ListValue.gif
index 7cb2132b359..7cb2132b359 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateListValue_values_ListValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateListValue_values_ListValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateListValue_values_QueryExecutionValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateListValue_values_QueryExecutionValue.gif
index 05dc6202681..05dc6202681 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateListValue_values_QueryExecutionValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateListValue_values_QueryExecutionValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif
index 5389eace04f..5389eace04f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_InvariantContainerRuleConfiguration.gif
new file mode 100644
index 00000000000..64a27cb9075
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_InvariantContainerRuleConfiguration.gif
new file mode 100644
index 00000000000..06ebb8d9145
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateRuntimeValuesEditionActionConfiguration_viewsToDisplay_ViewToDisplay.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuntimeValuesEditionActionConfiguration_viewsToDisplay_ViewToDisplay.gif
index 320d1178250..320d1178250 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateRuntimeValuesEditionActionConfiguration_viewsToDisplay_ViewToDisplay.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuntimeValuesEditionActionConfiguration_viewsToDisplay_ViewToDisplay.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
index 1d24f793204..1d24f793204 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateRuntimeValuesEditionAdviceConfiguration_viewsToDisplay_ViewToDisplay.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
index bf19516c7a4..bf19516c7a4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateSetValuesActionConfiguration_featuresToSet_FeatureToSet.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateSetValuesAdviceConfiguration_featuresToSet_FeatureToSet.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateSetValuesAdviceConfiguration_featuresToSet_FeatureToSet.gif
index 6878b7d54b1..6878b7d54b1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/ctool16/CreateSetValuesAdviceConfiguration_featuresToSet_FeatureToSet.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/ctool16/CreateSetValuesAdviceConfiguration_featuresToSet_FeatureToSet.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/ConstantValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/ConstantValue.gif
index e4bc22dd17e..e4bc22dd17e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/ConstantValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/ConstantValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/DynamicValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/DynamicValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/DynamicValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/DynamicValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/FeatureToSet.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/FeatureToSet.gif
index 5a9bc7514fa..5a9bc7514fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/FeatureToSet.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/FeatureToSet.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/HierarchyPermission.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/HierarchyPermission.gif
index c4a8af41844..c4a8af41844 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/HierarchyPermission.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/InvariantContainerRuleConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/InvariantContainerRuleConfiguration.gif
index 89ad5da38ab..89ad5da38ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/ListValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/ListValue.gif
index c3370c7ddd5..c3370c7ddd5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/ListValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/ListValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/QueryExecutionValue.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/QueryExecutionValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/QueryExecutionValue.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/QueryExecutionValue.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/RuntimeValuesEditionActionConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/RuntimeValuesEditionActionConfiguration.gif
index 9250fecbffd..9250fecbffd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/RuntimeValuesEditionActionConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/RuntimeValuesEditionActionConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif
index 48e3cf22687..48e3cf22687 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/RuntimeValuesEditionAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/SetValuesActionConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/SetValuesActionConfiguration.gif
index 7b7c428c715..7b7c428c715 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/SetValuesActionConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/SetValuesActionConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/SetValuesAdviceConfiguration.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/SetValuesAdviceConfiguration.gif
index 33a997a1606..33a997a1606 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/SetValuesAdviceConfiguration.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/SetValuesAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/ViewToDisplay.gif b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/ViewToDisplay.gif
index 83afb9b3c9a..83afb9b3c9a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/icons/full/obj16/ViewToDisplay.gif
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/icons/full/obj16/ViewToDisplay.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.ecore
index 9c6eb857b49..d35d1f3e65b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.ecore
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.ecore
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="invariantcontainerruleconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"
-    nsPrefix="invariantcontainerruleconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerRuleConfiguration"
-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"
-        eType="#//HierarchyPermission" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="container" nsURI="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1"

+    nsPrefix="invariantcontainerrule">

+  <eClassifiers xsi:type="ecore:EClass" name="InvariantContainerRuleConfiguration"

+      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore#//RuleConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="permissions" upperBound="-1"

+        eType="#//HierarchyPermission" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="HierarchyPermission">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerType" lowerBound="1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="permitted" lowerBound="1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.genmodel b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.genmodel
new file mode 100644
index 00000000000..fc18bd2dde7
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/InvariantContainerRule.genmodel
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
+    modelDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen" editDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.types.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.emf.types"
+    modelName="InvariantContainerRule" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.emf.types" editorPluginID="org.eclipse.papyrus.infra.types.editor"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel#//rulebased"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>InvariantContainerRule.ecore</foreignModel>
+  <genPackages prefix="InvariantContainerRule" basePackage="org.eclipse.papyrus.infra.emf.types.rules"
+      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="InvariantContainerRule.ecore#/">
+    <genClasses ecoreClass="InvariantContainerRule.ecore#//InvariantContainerRuleConfiguration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantContainerRule.ecore#//InvariantContainerRuleConfiguration/permissions"/>
+    </genClasses>
+    <genClasses ecoreClass="InvariantContainerRule.ecore#//HierarchyPermission">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerRule.ecore#//HierarchyPermission/containerType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerRule.ecore#//HierarchyPermission/permitted"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantContainerRule.ecore#//HierarchyPermission/strict"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.ecore b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.ecore
index dee75073a34..8e8734b8987 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.ecore
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.ecore
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="setvaluesadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"
-    nsPrefix="setvaluesadviceconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="SetValuesAdviceConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"
-        eType="#//FeatureToSet" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
-        eType="#//FeatureValue" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="values" nsURI="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"

+    nsPrefix="setvaluesadvice">

+  <eClassifiers xsi:type="ecore:EClass" name="SetValuesAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

+        eType="#//FeatureToSet" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>

+  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"

+        eType="#//FeatureValue" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>

+</ecore:EPackage>

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel
new file mode 100644
index 00000000000..a937a1c4195
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/model/SetValuesAdvice.genmodel
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen" editDirectory="/org.eclipse.papyrus.infra.emf.types/src-gen"

+    editorDirectory="/org.eclipse.papyrus.infra.emf.types.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.emf.types"

+    modelName="SetValuesAdvice" editPluginClass="org.eclipse.papyrus.infra.emf.types.advices.values.provider.SetValuesAdviceEditPlugin"

+    testsDirectory="/org.eclipse.papyrus.infra.emf.types.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"

+    complianceLevel="7.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">

+  <foreignModel>SetValuesAdvice.ecore</foreignModel>

+  <genPackages prefix="SetValuesAdvice" basePackage="org.eclipse.papyrus.infra.emf.types.advices"

+      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"

+      ecorePackage="SetValuesAdvice.ecore#/">

+    <genClasses ecoreClass="SetValuesAdvice.ecore#//SetValuesAdviceConfiguration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//SetValuesAdviceConfiguration/featuresToSet"/>

+    </genClasses>

+    <genClasses ecoreClass="SetValuesAdvice.ecore#//FeatureToSet">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesAdvice.ecore#//FeatureToSet/featureName"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//FeatureToSet/value"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="SetValuesAdvice.ecore#//FeatureValue"/>

+    <genClasses ecoreClass="SetValuesAdvice.ecore#//DynamicValue"/>

+    <genClasses ecoreClass="SetValuesAdvice.ecore#//ConstantValue">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//ConstantValue/valueInstance"/>

+    </genClasses>

+    <genClasses ecoreClass="SetValuesAdvice.ecore#//ListValue">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdvice.ecore#//ListValue/values"/>

+    </genClasses>

+    <genClasses ecoreClass="SetValuesAdvice.ecore#//QueryExecutionValue"/>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.properties
index db9976a2ed3..79340c1e4ad 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.properties
@@ -4,7 +4,7 @@
 #

 # $Id$

 

-pluginName = EMF ElementTypesConfigurations Model

+pluginName = EMF TypesConfigurations Model and Core

 providerName = Eclipse Modeling Project

 _UI_CreateChild_text = {0}

 _UI_CreateChild_text2 = {1} {0}

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.xml
new file mode 100644
index 00000000000..4e53bafcb4e
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/plugin.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated InvariantContainerRule -->
+      <package
+            uri="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage"
+            genModel="model/InvariantContainerRule.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated InvariantContainerRule -->
+      <parser
+            type="invariantcontainerrule"
+            class="org.eclipse.papyrus.infra.emf.types.rules.container.util.InvariantContainerRuleResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated InvariantContainerRule -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.rules.container.provider.InvariantContainerRuleItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.childCreationExtenders">
+      <!-- @generated InvariantContainerRule -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.rules.container.provider.InvariantContainerRuleItemProviderAdapterFactory$RuleBasedChildCreationExtender"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated SetValuesAdvice -->
+      <package
+            uri="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage"
+            genModel="model/SetValuesAdvice.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated SetValuesAdvice -->
+      <parser
+            type="setvaluesadvice"
+            class="org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated SetValuesAdvice -->
+      <factory
+            uri="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.advices.values.provider.SetValuesAdviceItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.edit.childCreationExtenders">
+      <!-- @generated SetValuesAdvice -->
+      <extender
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.emf.types.advices.values.provider.SetValuesAdviceItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.types.core.adviceConfigurationKind">
+      <adviceConfigurationKind
+            configurationClass="org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration"
+            factoryClass="org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceEditHelperAdviceFactory">
+      </adviceConfigurationKind>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.infra.types.rulebased.ruleKind">
+      <ruleKind
+            configurationClass="org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration"
+            ruleClass="org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRule">
+      </ruleKind>
+   </extension>
+</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
index 13dc0825cbb..a3299c0e10a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/pom.xml
@@ -2,11 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.ui</artifactId>
+	<artifactId>org.eclipse.papyrus.infra.emf.types</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/ConstantValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/ConstantValue.java
index d2332ef8ed7..7c8ee5f06fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/ConstantValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/ConstantValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -23,10 +23,10 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getConstantValue()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getConstantValue()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface ConstantValue extends FeatureValue {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value Instance</em>' containment reference.
 	 * @see #setValueInstance(ValueSpecification)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getConstantValue_ValueInstance()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getConstantValue_ValueInstance()
 	 * @model containment="true"
 	 * @generated
 	 */
 	ValueSpecification getValueInstance();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value Instance</em>' containment reference.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/DynamicValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/DynamicValue.java
index 210ab2b1140..1511d0edb7f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/DynamicValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/DynamicValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 
 /**
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadvice
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getDynamicValue()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getDynamicValue()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/FeatureToSet.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureToSet.java
index 8c200d63b92..fbd31dc6fcf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/FeatureToSet.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureToSet.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getValue <em>Value</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getFeatureToSet()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getFeatureToSet()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Name</em>' attribute.
 	 * @see #setFeatureName(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getFeatureToSet_FeatureName()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getFeatureToSet_FeatureName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFeatureName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Name</em>' attribute.
@@ -68,14 +68,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' containment reference.
 	 * @see #setValue(FeatureValue)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getFeatureToSet_Value()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getFeatureToSet_Value()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
 	FeatureValue getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getValue <em>Value</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' containment reference.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/FeatureValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValue.java
index 7287bc5540b..3968704c8d6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/FeatureValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getFeatureValue()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getFeatureValue()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/ListValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/ListValue.java
index 6da05dccbb8..3af22c17bf0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/ListValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/ListValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,17 +23,17 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue#getValues <em>Values</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getListValue()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getListValue()
  * @model
  * @generated
  */
 public interface ListValue extends FeatureValue {
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear,
@@ -41,7 +41,7 @@ public interface ListValue extends FeatureValue {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Values</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getListValue_Values()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getListValue_Values()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/QueryExecutionValue.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/QueryExecutionValue.java
index 8b560bbfa5c..e5883f48ca5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/QueryExecutionValue.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/QueryExecutionValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 
 /**
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadvice
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getQueryExecutionValue()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getQueryExecutionValue()
  * @model
  * @generated
  */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceConfiguration.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceConfiguration.java
index 7a5ae53df36..8603abc35ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceConfiguration.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceConfiguration.java
@@ -10,32 +10,32 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Set Values Advice Configuration</b></em>'.
+ * A representation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration#getFeaturesToSet <em>Features To Set</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getSetValuesAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getSetValuesAdviceConfiguration()
  * @model
  * @generated
  */
 public interface SetValuesAdviceConfiguration extends AbstractAdviceBindingConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Features To Set</em>' containment reference list isn't clear,
@@ -43,7 +43,7 @@ public interface SetValuesAdviceConfiguration extends AbstractAdviceBindingConfi
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Features To Set</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#getSetValuesAdviceConfiguration_FeaturesToSet()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#getSetValuesAdviceConfiguration_FeaturesToSet()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceConfigurationFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceFactory.java
index c7bd21f2749..0b1ee7391c9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceConfigurationFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,23 +19,23 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage
  * @generated
  */
-public interface SetValuesAdviceConfigurationFactory extends EFactory {
+public interface SetValuesAdviceFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	SetValuesAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationFactoryImpl.init();
+	SetValuesAdviceFactory eINSTANCE = org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdviceFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Set Values Advice Configuration</em>'.
+	 * Returns a new object of class '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Set Values Advice Configuration</em>'.
+	 * @return a new object of class '<em>Configuration</em>'.
 	 * @generated
 	 */
 	SetValuesAdviceConfiguration createSetValuesAdviceConfiguration();
@@ -83,6 +83,6 @@ public interface SetValuesAdviceConfigurationFactory extends EFactory {
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	SetValuesAdviceConfigurationPackage getSetValuesAdviceConfigurationPackage();
+	SetValuesAdvicePackage getSetValuesAdvicePackage();
 
-} //SetValuesAdviceConfigurationFactory
+} //SetValuesAdviceFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceConfigurationPackage.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdvicePackage.java
index 29ae78d98a8..60ef970d7e9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceConfigurationPackage.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdvicePackage.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
+package org.eclipse.papyrus.infra.emf.types.advices.values;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,18 +30,18 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationFactory
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceFactory
  * @model kind="package"
  * @generated
  */
-public interface SetValuesAdviceConfigurationPackage extends EPackage {
+public interface SetValuesAdvicePackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "setvaluesadviceconfiguration";
+	String eNAME = "values";
 
 	/**
 	 * The package namespace URI.
@@ -49,7 +49,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1";
 
 	/**
 	 * The package namespace name.
@@ -57,7 +57,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "setvaluesadviceconfiguration";
+	String eNS_PREFIX = "setvaluesadvice";
 
 	/**
 	 * The singleton instance of the package.
@@ -65,14 +65,14 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	SetValuesAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl.init();
+	SetValuesAdvicePackage eINSTANCE = org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationImpl <em>Set Values Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdviceConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getSetValuesAdviceConfiguration()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getSetValuesAdviceConfiguration()
 	 * @generated
 	 */
 	int SET_VALUES_ADVICE_CONFIGURATION = 0;
@@ -84,7 +84,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
+	int SET_VALUES_ADVICE_CONFIGURATION__DESCRIPTION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' attribute list.
@@ -93,7 +93,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__BEFORE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
+	int SET_VALUES_ADVICE_CONFIGURATION__BEFORE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
 
 	/**
 	 * The feature id for the '<em><b>After</b></em>' attribute list.
@@ -102,7 +102,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__AFTER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
+	int SET_VALUES_ADVICE_CONFIGURATION__AFTER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -111,7 +111,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
+	int SET_VALUES_ADVICE_CONFIGURATION__IDENTIFIER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
 
 	/**
 	 * The feature id for the '<em><b>Target</b></em>' reference.
@@ -120,7 +120,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__TARGET = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
+	int SET_VALUES_ADVICE_CONFIGURATION__TARGET = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
 
 	/**
 	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
@@ -129,7 +129,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
+	int SET_VALUES_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
 
 	/**
 	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
@@ -138,7 +138,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
+	int SET_VALUES_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
 
 	/**
 	 * The feature id for the '<em><b>Inheritance</b></em>' attribute.
@@ -147,7 +147,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__INHERITANCE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
+	int SET_VALUES_ADVICE_CONFIGURATION__INHERITANCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
 
 	/**
 	 * The feature id for the '<em><b>Features To Set</b></em>' containment reference list.
@@ -156,23 +156,23 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
+	int SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Set Values Advice Configuration</em>' class.
+	 * The number of structural features of the '<em>Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SET_VALUES_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
+	int SET_VALUES_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureToSetImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getFeatureToSet()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureToSetImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getFeatureToSet()
 	 * @generated
 	 */
 	int FEATURE_TO_SET = 1;
@@ -205,11 +205,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	int FEATURE_TO_SET_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureValueImpl <em>Feature Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureValueImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getFeatureValue()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureValueImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getFeatureValue()
 	 * @generated
 	 */
 	int FEATURE_VALUE = 2;
@@ -224,11 +224,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	int FEATURE_VALUE_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.DynamicValueImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getDynamicValue()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.DynamicValueImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getDynamicValue()
 	 * @generated
 	 */
 	int DYNAMIC_VALUE = 3;
@@ -243,11 +243,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.ConstantValueImpl <em>Constant Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ConstantValueImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getConstantValue()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.ConstantValueImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getConstantValue()
 	 * @generated
 	 */
 	int CONSTANT_VALUE = 4;
@@ -271,11 +271,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.ListValueImpl <em>List Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ListValueImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getListValue()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.ListValueImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getListValue()
 	 * @generated
 	 */
 	int LIST_VALUE = 5;
@@ -299,11 +299,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.QueryExecutionValueImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getQueryExecutionValue()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.QueryExecutionValueImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getQueryExecutionValue()
 	 * @generated
 	 */
 	int QUERY_EXECUTION_VALUE = 6;
@@ -319,126 +319,126 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration <em>Set Values Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Set Values Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration
+	 * @return the meta object for class '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration
 	 * @generated
 	 */
 	EClass getSetValuesAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration#getFeaturesToSet <em>Features To Set</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration#getFeaturesToSet <em>Features To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration#getFeaturesToSet()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration#getFeaturesToSet()
 	 * @see #getSetValuesAdviceConfiguration()
 	 * @generated
 	 */
 	EReference getSetValuesAdviceConfiguration_FeaturesToSet();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet <em>Feature To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature To Set</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet
 	 * @generated
 	 */
 	EClass getFeatureToSet();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Feature Name</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getFeatureName()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getFeatureName()
 	 * @see #getFeatureToSet()
 	 * @generated
 	 */
 	EAttribute getFeatureToSet_FeatureName();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getValue <em>Value</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet#getValue()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet#getValue()
 	 * @see #getFeatureToSet()
 	 * @generated
 	 */
 	EReference getFeatureToSet_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue <em>Feature Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Value</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue
 	 * @generated
 	 */
 	EClass getFeatureValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue <em>Dynamic Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Dynamic Value</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue
 	 * @generated
 	 */
 	EClass getDynamicValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue <em>Constant Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Constant Value</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue
 	 * @generated
 	 */
 	EClass getConstantValue();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue#getValueInstance <em>Value Instance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value Instance</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue#getValueInstance()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue#getValueInstance()
 	 * @see #getConstantValue()
 	 * @generated
 	 */
 	EReference getConstantValue_ValueInstance();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue <em>List Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue <em>List Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>List Value</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.ListValue
 	 * @generated
 	 */
 	EClass getListValue();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue#getValues <em>Values</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue#getValues <em>Values</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Values</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue#getValues()
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.ListValue#getValues()
 	 * @see #getListValue()
 	 * @generated
 	 */
 	EReference getListValue_Values();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue <em>Query Execution Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Query Execution Value</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue
 	 * @generated
 	 */
 	EClass getQueryExecutionValue();
@@ -450,7 +450,7 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	SetValuesAdviceConfigurationFactory getSetValuesAdviceConfigurationFactory();
+	SetValuesAdviceFactory getSetValuesAdviceFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -466,11 +466,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationImpl <em>Set Values Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdviceConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getSetValuesAdviceConfiguration()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getSetValuesAdviceConfiguration()
 		 * @generated
 		 */
 		EClass SET_VALUES_ADVICE_CONFIGURATION = eINSTANCE.getSetValuesAdviceConfiguration();
@@ -484,11 +484,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 		EReference SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET = eINSTANCE.getSetValuesAdviceConfiguration_FeaturesToSet();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureToSetImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getFeatureToSet()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureToSetImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getFeatureToSet()
 		 * @generated
 		 */
 		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();
@@ -510,31 +510,31 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureValueImpl <em>Feature Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureValueImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getFeatureValue()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureValueImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getFeatureValue()
 		 * @generated
 		 */
 		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.DynamicValueImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getDynamicValue()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.DynamicValueImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getDynamicValue()
 		 * @generated
 		 */
 		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.ConstantValueImpl <em>Constant Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ConstantValueImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getConstantValue()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.ConstantValueImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getConstantValue()
 		 * @generated
 		 */
 		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();
@@ -548,11 +548,11 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.ListValueImpl <em>List Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ListValueImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getListValue()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.ListValueImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getListValue()
 		 * @generated
 		 */
 		EClass LIST_VALUE = eINSTANCE.getListValue();
@@ -566,15 +566,15 @@ public interface SetValuesAdviceConfigurationPackage extends EPackage {
 		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.QueryExecutionValueImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationPackageImpl#getQueryExecutionValue()
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.QueryExecutionValueImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdvicePackageImpl#getQueryExecutionValue()
 		 * @generated
 		 */
 		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();
 
 	}
 
-} //SetValuesAdviceConfigurationPackage
+} //SetValuesAdvicePackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/ConstantValueImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/ConstantValueImpl.java
index da3850ba4b5..2e87bf3d248 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/ConstantValueImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/ConstantValueImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -33,7 +33,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
  * </ul>
  *
  * @generated
@@ -65,7 +65,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE;
+		return SetValuesAdvicePackage.Literals.CONSTANT_VALUE;
 	}
 
 	/**
@@ -86,7 +86,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 		ValueSpecification oldValueInstance = valueInstance;
 		valueInstance = newValueInstance;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -101,14 +101,14 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 		if (newValueInstance != valueInstance) {
 			NotificationChain msgs = null;
 			if (valueInstance != null)
-				msgs = ((InternalEObject)valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
+				msgs = ((InternalEObject)valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
 			if (newValueInstance != null)
-				msgs = ((InternalEObject)newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
+				msgs = ((InternalEObject)newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
 			msgs = basicSetValueInstance(newValueInstance, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
+			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				return basicSetValueInstance(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -133,7 +133,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				return getValueInstance();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -147,7 +147,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				setValueInstance((ValueSpecification)newValue);
 				return;
 		}
@@ -162,7 +162,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				setValueInstance((ValueSpecification)null);
 				return;
 		}
@@ -177,7 +177,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				return valueInstance != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/DynamicValueImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/DynamicValueImpl.java
index 64b989a0c13..e204d86c803 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/DynamicValueImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/DynamicValueImpl.java
@@ -10,12 +10,12 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,7 +41,7 @@ public abstract class DynamicValueImpl extends FeatureValueImpl implements Dynam
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.DYNAMIC_VALUE;
+		return SetValuesAdvicePackage.Literals.DYNAMIC_VALUE;
 	}
 
 } //DynamicValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/FeatureToSetImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/FeatureToSetImpl.java
index b1e9bead356..45fbd7e49ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/FeatureToSetImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/FeatureToSetImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadvicec
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @generated
@@ -86,7 +86,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.FEATURE_TO_SET;
+		return SetValuesAdvicePackage.Literals.FEATURE_TO_SET;
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 		String oldFeatureName = featureName;
 		featureName = newFeatureName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));
+			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesAdvicePackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));
 	}
 
 	/**
@@ -128,7 +128,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 		FeatureValue oldValue = value;
 		value = newValue;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, oldValue, newValue);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SetValuesAdvicePackage.FEATURE_TO_SET__VALUE, oldValue, newValue);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -143,14 +143,14 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 		if (newValue != value) {
 			NotificationChain msgs = null;
 			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
+				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SetValuesAdvicePackage.FEATURE_TO_SET__VALUE, null, msgs);
 			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
+				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SetValuesAdvicePackage.FEATURE_TO_SET__VALUE, null, msgs);
 			msgs = basicSetValue(newValue, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, newValue, newValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, SetValuesAdvicePackage.FEATURE_TO_SET__VALUE, newValue, newValue));
 	}
 
 	/**
@@ -161,7 +161,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__VALUE:
 				return basicSetValue(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -175,9 +175,9 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				return getFeatureName();
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__VALUE:
 				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -191,10 +191,10 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				setFeatureName((String)newValue);
 				return;
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__VALUE:
 				setValue((FeatureValue)newValue);
 				return;
 		}
@@ -209,10 +209,10 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				setFeatureName(FEATURE_NAME_EDEFAULT);
 				return;
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__VALUE:
 				setValue((FeatureValue)null);
 				return;
 		}
@@ -227,9 +227,9 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				return FEATURE_NAME_EDEFAULT == null ? featureName != null : !FEATURE_NAME_EDEFAULT.equals(featureName);
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__VALUE:
 				return value != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/FeatureValueImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/FeatureValueImpl.java
index dce68bcb235..5458fb8b2dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/FeatureValueImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/FeatureValueImpl.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,7 +43,7 @@ public abstract class FeatureValueImpl extends EObjectImpl implements FeatureVal
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.FEATURE_VALUE;
+		return SetValuesAdvicePackage.Literals.FEATURE_VALUE;
 	}
 
 } //FeatureValueImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ListValueImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/ListValueImpl.java
index 12b75988ea4..fdac4a7810c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ListValueImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/ListValueImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import java.util.Collection;
 
@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.ListValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.ListValueImpl#getValues <em>Values</em>}</li>
  * </ul>
  *
  * @generated
@@ -68,7 +68,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.LIST_VALUE;
+		return SetValuesAdvicePackage.Literals.LIST_VALUE;
 	}
 
 	/**
@@ -78,7 +78,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	 */
 	public EList<FeatureValue> getValues() {
 		if (values == null) {
-			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE__VALUES);
+			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, SetValuesAdvicePackage.LIST_VALUE__VALUES);
 		}
 		return values;
 	}
@@ -91,7 +91,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case SetValuesAdvicePackage.LIST_VALUE__VALUES:
 				return ((InternalEList<?>)getValues()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -105,7 +105,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case SetValuesAdvicePackage.LIST_VALUE__VALUES:
 				return getValues();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -120,7 +120,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case SetValuesAdvicePackage.LIST_VALUE__VALUES:
 				getValues().clear();
 				getValues().addAll((Collection<? extends FeatureValue>)newValue);
 				return;
@@ -136,7 +136,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case SetValuesAdvicePackage.LIST_VALUE__VALUES:
 				getValues().clear();
 				return;
 		}
@@ -151,7 +151,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case SetValuesAdvicePackage.LIST_VALUE__VALUES:
 				return values != null && !values.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/QueryExecutionValueImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/QueryExecutionValueImpl.java
index 31933ccbdd1..974e83b77f9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/QueryExecutionValueImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/QueryExecutionValueImpl.java
@@ -10,12 +10,12 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,7 +41,7 @@ public class QueryExecutionValueImpl extends DynamicValueImpl implements QueryEx
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;
+		return SetValuesAdvicePackage.Literals.QUERY_EXECUTION_VALUE;
 	}
 
 } //QueryExecutionValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/SetValuesAdviceConfigurationImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/SetValuesAdviceConfigurationImpl.java
index 2bfbf97b262..1345c934375 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/SetValuesAdviceConfigurationImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/SetValuesAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import java.util.Collection;
 
@@ -24,21 +24,21 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl;
+import org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Set Values Advice Configuration</b></em>'.
+ * An implementation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.SetValuesAdviceConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.advices.values.impl.SetValuesAdviceConfigurationImpl#getFeaturesToSet <em>Features To Set</em>}</li>
  * </ul>
  *
  * @generated
@@ -70,7 +70,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.SET_VALUES_ADVICE_CONFIGURATION;
+		return SetValuesAdvicePackage.Literals.SET_VALUES_ADVICE_CONFIGURATION;
 	}
 
 	/**
@@ -80,7 +80,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	 */
 	public EList<FeatureToSet> getFeaturesToSet() {
 		if (featuresToSet == null) {
-			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET);
+			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET);
 		}
 		return featuresToSet;
 	}
@@ -93,7 +93,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
 				return ((InternalEList<?>)getFeaturesToSet()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -107,7 +107,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
 				return getFeaturesToSet();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -122,7 +122,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
 				getFeaturesToSet().clear();
 				getFeaturesToSet().addAll((Collection<? extends FeatureToSet>)newValue);
 				return;
@@ -138,7 +138,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
 				getFeaturesToSet().clear();
 				return;
 		}
@@ -153,7 +153,7 @@ public class SetValuesAdviceConfigurationImpl extends AbstractAdviceBindingConfi
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
 				return featuresToSet != null && !featuresToSet.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/SetValuesAdviceConfigurationFactoryImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/SetValuesAdviceFactoryImpl.java
index a117c494911..884a0f1dab3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/SetValuesAdviceConfigurationFactoryImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/SetValuesAdviceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.*;
+import org.eclipse.papyrus.infra.emf.types.advices.values.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,24 +28,24 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadvicec
  * <!-- end-user-doc -->
  * @generated
  */
-public class SetValuesAdviceConfigurationFactoryImpl extends EFactoryImpl implements SetValuesAdviceConfigurationFactory {
+public class SetValuesAdviceFactoryImpl extends EFactoryImpl implements SetValuesAdviceFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static SetValuesAdviceConfigurationFactory init() {
+	public static SetValuesAdviceFactory init() {
 		try {
-			SetValuesAdviceConfigurationFactory theSetValuesAdviceConfigurationFactory = (SetValuesAdviceConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(SetValuesAdviceConfigurationPackage.eNS_URI);
-			if (theSetValuesAdviceConfigurationFactory != null) {
-				return theSetValuesAdviceConfigurationFactory;
+			SetValuesAdviceFactory theSetValuesAdviceFactory = (SetValuesAdviceFactory)EPackage.Registry.INSTANCE.getEFactory(SetValuesAdvicePackage.eNS_URI);
+			if (theSetValuesAdviceFactory != null) {
+				return theSetValuesAdviceFactory;
 			}
 		}
 		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new SetValuesAdviceConfigurationFactoryImpl();
+		return new SetValuesAdviceFactoryImpl();
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class SetValuesAdviceConfigurationFactoryImpl extends EFactoryImpl implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationFactoryImpl() {
+	public SetValuesAdviceFactoryImpl() {
 		super();
 	}
 
@@ -66,11 +66,11 @@ public class SetValuesAdviceConfigurationFactoryImpl extends EFactoryImpl implem
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION: return createSetValuesAdviceConfiguration();
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET: return createFeatureToSet();
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE: return createConstantValue();
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE: return createListValue();
-			case SetValuesAdviceConfigurationPackage.QUERY_EXECUTION_VALUE: return createQueryExecutionValue();
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION: return createSetValuesAdviceConfiguration();
+			case SetValuesAdvicePackage.FEATURE_TO_SET: return createFeatureToSet();
+			case SetValuesAdvicePackage.CONSTANT_VALUE: return createConstantValue();
+			case SetValuesAdvicePackage.LIST_VALUE: return createListValue();
+			case SetValuesAdvicePackage.QUERY_EXECUTION_VALUE: return createQueryExecutionValue();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -131,8 +131,8 @@ public class SetValuesAdviceConfigurationFactoryImpl extends EFactoryImpl implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationPackage getSetValuesAdviceConfigurationPackage() {
-		return (SetValuesAdviceConfigurationPackage)getEPackage();
+	public SetValuesAdvicePackage getSetValuesAdvicePackage() {
+		return (SetValuesAdvicePackage)getEPackage();
 	}
 
 	/**
@@ -142,8 +142,8 @@ public class SetValuesAdviceConfigurationFactoryImpl extends EFactoryImpl implem
 	 * @generated
 	 */
 	@Deprecated
-	public static SetValuesAdviceConfigurationPackage getPackage() {
-		return SetValuesAdviceConfigurationPackage.eINSTANCE;
+	public static SetValuesAdvicePackage getPackage() {
+		return SetValuesAdvicePackage.eINSTANCE;
 	}
 
-} //SetValuesAdviceConfigurationFactoryImpl
+} //SetValuesAdviceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/SetValuesAdviceConfigurationPackageImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/SetValuesAdvicePackageImpl.java
index 53bce98fb5d..8f6c95804c1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/SetValuesAdviceConfigurationPackageImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/impl/SetValuesAdvicePackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.advices.values.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,17 +20,17 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.ListValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceFactory;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -40,7 +40,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implements SetValuesAdviceConfigurationPackage {
+public class SetValuesAdvicePackageImpl extends EPackageImpl implements SetValuesAdvicePackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -101,12 +101,12 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private SetValuesAdviceConfigurationPackageImpl() {
-		super(eNS_URI, SetValuesAdviceConfigurationFactory.eINSTANCE);
+	private SetValuesAdvicePackageImpl() {
+		super(eNS_URI, SetValuesAdviceFactory.eINSTANCE);
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link SetValuesAdviceConfigurationPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link SetValuesAdvicePackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -128,31 +128,31 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static SetValuesAdviceConfigurationPackage init() {
-		if (isInited) return (SetValuesAdviceConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(SetValuesAdviceConfigurationPackage.eNS_URI);
+	public static SetValuesAdvicePackage init() {
+		if (isInited) return (SetValuesAdvicePackage)EPackage.Registry.INSTANCE.getEPackage(SetValuesAdvicePackage.eNS_URI);
 
 		// Obtain or create and register package
-		SetValuesAdviceConfigurationPackageImpl theSetValuesAdviceConfigurationPackage = (SetValuesAdviceConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SetValuesAdviceConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SetValuesAdviceConfigurationPackageImpl());
+		SetValuesAdvicePackageImpl theSetValuesAdvicePackage = (SetValuesAdvicePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SetValuesAdvicePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SetValuesAdvicePackageImpl());
 
 		isInited = true;
 
 		// Initialize simple dependencies
-		ElementtypesconfigurationsPackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
 		UMLPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
-		theSetValuesAdviceConfigurationPackage.createPackageContents();
+		theSetValuesAdvicePackage.createPackageContents();
 
 		// Initialize created meta-data
-		theSetValuesAdviceConfigurationPackage.initializePackageContents();
+		theSetValuesAdvicePackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		theSetValuesAdviceConfigurationPackage.freeze();
+		theSetValuesAdvicePackage.freeze();
 
   
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(SetValuesAdviceConfigurationPackage.eNS_URI, theSetValuesAdviceConfigurationPackage);
-		return theSetValuesAdviceConfigurationPackage;
+		EPackage.Registry.INSTANCE.put(SetValuesAdvicePackage.eNS_URI, theSetValuesAdvicePackage);
+		return theSetValuesAdvicePackage;
 	}
 
 	/**
@@ -268,8 +268,8 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationFactory getSetValuesAdviceConfigurationFactory() {
-		return (SetValuesAdviceConfigurationFactory)getEFactoryInstance();
+	public SetValuesAdviceFactory getSetValuesAdviceFactory() {
+		return (SetValuesAdviceFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -335,7 +335,7 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		ElementtypesconfigurationsPackage theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
 
@@ -344,7 +344,7 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		setValuesAdviceConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAbstractAdviceBindingConfiguration());
+		setValuesAdviceConfigurationEClass.getESuperTypes().add(theElementTypesConfigurationsPackage.getAbstractAdviceBindingConfiguration());
 		dynamicValueEClass.getESuperTypes().add(this.getFeatureValue());
 		constantValueEClass.getESuperTypes().add(this.getFeatureValue());
 		listValueEClass.getESuperTypes().add(this.getFeatureValue());
@@ -374,4 +374,4 @@ public class SetValuesAdviceConfigurationPackageImpl extends EPackageImpl implem
 		createResource(eNS_URI);
 	}
 
-} //SetValuesAdviceConfigurationPackageImpl
+} //SetValuesAdvicePackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/ConstantValueItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/ConstantValueItemProvider.java
index 03f0a009693..1c17bc4e4d6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/ConstantValueItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/ConstantValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -24,13 +24,13 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 import org.eclipse.uml2.uml.UMLFactory;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -73,7 +73,7 @@ public class ConstantValueItemProvider extends FeatureValueItemProvider {
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE);
+			childrenFeatures.add(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE);
 		}
 		return childrenFeatures;
 	}
@@ -126,7 +126,7 @@ public class ConstantValueItemProvider extends FeatureValueItemProvider {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ConstantValue.class)) {
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case SetValuesAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -146,77 +146,77 @@ public class ConstantValueItemProvider extends FeatureValueItemProvider {
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createOpaqueExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createStringExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createInstanceValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createTimeExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createDuration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createInterval()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createDurationInterval()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralBoolean()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralInteger()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralNull()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralReal()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralString()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralUnlimitedNatural()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(SetValuesAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createTimeInterval()));
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/DynamicValueItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/DynamicValueItemProvider.java
index ca21cf010d2..e688855181a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/DynamicValueItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/DynamicValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureToSetItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/FeatureToSetItemProvider.java
index 8c524f91e55..68ce38da760 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureToSetItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/FeatureToSetItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -34,12 +34,12 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceFactory;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -91,7 +91,7 @@ public class FeatureToSetItemProvider
 				 getResourceLocator(),
 				 getString("_UI_FeatureToSet_featureName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureToSet_featureName_feature", "_UI_FeatureToSet_type"),
-				 ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_TO_SET__FEATURE_NAME,
+				 SetValuesAdvicePackage.Literals.FEATURE_TO_SET__FEATURE_NAME,
 				 true,
 				 false,
 				 false,
@@ -112,7 +112,7 @@ public class FeatureToSetItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE);
+			childrenFeatures.add(SetValuesAdvicePackage.Literals.FEATURE_TO_SET__VALUE);
 		}
 		return childrenFeatures;
 	}
@@ -168,10 +168,10 @@ public class FeatureToSetItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(FeatureToSet.class)) {
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case SetValuesAdvicePackage.FEATURE_TO_SET__VALUE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -191,18 +191,18 @@ public class FeatureToSetItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE,
-				 ApplyStereotypeAdviceConfigurationFactory.eINSTANCE.createListValue()));
+				(SetValuesAdvicePackage.Literals.FEATURE_TO_SET__VALUE,
+				 SetValuesAdviceFactory.eINSTANCE.createConstantValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE,
-				 ApplyStereotypeAdviceConfigurationFactory.eINSTANCE.createConstantValue()));
+				(SetValuesAdvicePackage.Literals.FEATURE_TO_SET__VALUE,
+				 SetValuesAdviceFactory.eINSTANCE.createListValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE,
-				 ApplyStereotypeAdviceConfigurationFactory.eINSTANCE.createQueryExecutionValue()));
+				(SetValuesAdvicePackage.Literals.FEATURE_TO_SET__VALUE,
+				 SetValuesAdviceFactory.eINSTANCE.createQueryExecutionValue()));
 	}
 
 	/**
@@ -213,7 +213,7 @@ public class FeatureToSetItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ApplyStereotypeAdviceConfigurationEditPlugin.INSTANCE;
+		return SetValuesAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/FeatureValueItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/FeatureValueItemProvider.java
index 8a5dee8ab9d..2dd4cc5df76 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/FeatureValueItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/FeatureValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -113,7 +113,7 @@ public class FeatureValueItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return SetValuesAdviceConfigurationEditPlugin.INSTANCE;
+		return SetValuesAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/ListValueItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/ListValueItemProvider.java
index 94e52648859..0371e0da16d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/ListValueItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/ListValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -24,12 +24,12 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.ListValue;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceFactory;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -72,7 +72,7 @@ public class ListValueItemProvider extends FeatureValueItemProvider {
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(SetValuesAdviceConfigurationPackage.Literals.LIST_VALUE__VALUES);
+			childrenFeatures.add(SetValuesAdvicePackage.Literals.LIST_VALUE__VALUES);
 		}
 		return childrenFeatures;
 	}
@@ -125,7 +125,7 @@ public class ListValueItemProvider extends FeatureValueItemProvider {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ListValue.class)) {
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case SetValuesAdvicePackage.LIST_VALUE__VALUES:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -145,18 +145,18 @@ public class ListValueItemProvider extends FeatureValueItemProvider {
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.LIST_VALUE__VALUES,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createConstantValue()));
+				(SetValuesAdvicePackage.Literals.LIST_VALUE__VALUES,
+				 SetValuesAdviceFactory.eINSTANCE.createConstantValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.LIST_VALUE__VALUES,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createListValue()));
+				(SetValuesAdvicePackage.Literals.LIST_VALUE__VALUES,
+				 SetValuesAdviceFactory.eINSTANCE.createListValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.LIST_VALUE__VALUES,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createQueryExecutionValue()));
+				(SetValuesAdvicePackage.Literals.LIST_VALUE__VALUES,
+				 SetValuesAdviceFactory.eINSTANCE.createQueryExecutionValue()));
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/QueryExecutionValueItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/QueryExecutionValueItemProvider.java
index 82fe5821b2b..132b086cb40 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/QueryExecutionValueItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/QueryExecutionValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/SetValuesAdviceConfigurationItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/SetValuesAdviceConfigurationItemProvider.java
index 945c9cf8293..63f204c6ae5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/SetValuesAdviceConfigurationItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/SetValuesAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 
 import java.util.Collection;
@@ -26,14 +26,14 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceFactory;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractAdviceBindingConfigurationItemProvider;
+import org.eclipse.papyrus.infra.types.provider.AbstractAdviceBindingConfigurationItemProvider;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -76,7 +76,7 @@ public class SetValuesAdviceConfigurationItemProvider extends AbstractAdviceBind
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(SetValuesAdviceConfigurationPackage.Literals.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET);
+			childrenFeatures.add(SetValuesAdvicePackage.Literals.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET);
 		}
 		return childrenFeatures;
 	}
@@ -132,7 +132,7 @@ public class SetValuesAdviceConfigurationItemProvider extends AbstractAdviceBind
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(SetValuesAdviceConfiguration.class)) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -152,8 +152,8 @@ public class SetValuesAdviceConfigurationItemProvider extends AbstractAdviceBind
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createFeatureToSet()));
+				(SetValuesAdvicePackage.Literals.SET_VALUES_ADVICE_CONFIGURATION__FEATURES_TO_SET,
+				 SetValuesAdviceFactory.eINSTANCE.createFeatureToSet()));
 	}
 
 	/**
@@ -164,7 +164,7 @@ public class SetValuesAdviceConfigurationItemProvider extends AbstractAdviceBind
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return SetValuesAdviceConfigurationEditPlugin.INSTANCE;
+		return SetValuesAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/SetValuesAdviceConfigurationEditPlugin.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/SetValuesAdviceEditPlugin.java
index b72690c9eba..4d2ce3f144c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/SetValuesAdviceConfigurationEditPlugin.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/SetValuesAdviceEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -18,24 +18,24 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 import org.eclipse.uml2.uml.edit.UMLEditPlugin;
 
 /**
- * This is the central singleton for the SetValuesAdviceConfiguration edit plugin.
+ * This is the central singleton for the SetValuesAdvice edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public final class SetValuesAdviceConfigurationEditPlugin extends EMFPlugin {
+public final class SetValuesAdviceEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final SetValuesAdviceConfigurationEditPlugin INSTANCE = new SetValuesAdviceConfigurationEditPlugin();
+	public static final SetValuesAdviceEditPlugin INSTANCE = new SetValuesAdviceEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -51,11 +51,11 @@ public final class SetValuesAdviceConfigurationEditPlugin extends EMFPlugin {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationEditPlugin() {
+	public SetValuesAdviceEditPlugin() {
 		super
 		  (new ResourceLocator [] {
 		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
 		     UMLEditPlugin.INSTANCE,
 		   });
 	}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/SetValuesAdviceConfigurationItemProviderAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/SetValuesAdviceItemProviderAdapterFactory.java
index b9506b1c051..36424e29805 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/SetValuesAdviceConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/provider/SetValuesAdviceItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.advices.values.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,14 +41,14 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationFactory;
+import org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceAdapterFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationAdapterFactory;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsSwitch;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -59,7 +59,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.util.Elementtypescon
  * <!-- end-user-doc -->
  * @generated
  */
-public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetValuesAdviceConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class SetValuesAdviceItemProviderAdapterFactory extends SetValuesAdviceAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -90,7 +90,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationItemProviderAdapterFactory() {
+	public SetValuesAdviceItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -99,7 +99,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -107,7 +107,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	protected SetValuesAdviceConfigurationItemProvider setValuesAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -122,7 +122,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -130,7 +130,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	protected FeatureToSetItemProvider featureToSetItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -145,7 +145,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -153,7 +153,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	protected ConstantValueItemProvider constantValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -168,7 +168,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -176,7 +176,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	protected ListValueItemProvider listValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -191,7 +191,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -199,7 +199,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	protected QueryExecutionValueItemProvider queryExecutionValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -320,19 +320,19 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 	}
 
 	/**
-	 * A child creation extender for the {@link ElementtypesconfigurationsPackage}.
+	 * A child creation extender for the {@link ElementTypesConfigurationsPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {
+	public static class ElementTypesConfigurationsChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {
+		protected static class CreationSwitch extends ElementTypesConfigurationsSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -368,8 +368,8 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 			public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
-						 SetValuesAdviceConfigurationFactory.eINSTANCE.createSetValuesAdviceConfiguration()));
+						(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+						 SetValuesAdviceFactory.eINSTANCE.createSetValuesAdviceConfiguration()));
 
 				return null;
 			}
@@ -402,7 +402,7 @@ public class SetValuesAdviceConfigurationItemProviderAdapterFactory extends SetV
 		 * @generated
 		 */
 		public ResourceLocator getResourceLocator() {
-			return SetValuesAdviceConfigurationEditPlugin.INSTANCE;
+			return SetValuesAdviceEditPlugin.INSTANCE;
 		}
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceAdapterFactory.java
index e26b39a9bdc..eef8a34eb33 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.advices.values.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,29 +19,29 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.emf.types.advices.values.*;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.*;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage
  * @generated
  */
-public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryImpl {
+public class SetValuesAdviceAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static SetValuesAdviceConfigurationPackage modelPackage;
+	protected static SetValuesAdvicePackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -49,9 +49,9 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationAdapterFactory() {
+	public SetValuesAdviceAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = SetValuesAdviceConfigurationPackage.eINSTANCE;
+			modelPackage = SetValuesAdvicePackage.eINSTANCE;
 		}
 	}
 
@@ -80,8 +80,8 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected SetValuesAdviceConfigurationSwitch<Adapter> modelSwitch =
-		new SetValuesAdviceConfigurationSwitch<Adapter>() {
+	protected SetValuesAdviceSwitch<Adapter> modelSwitch =
+		new SetValuesAdviceSwitch<Adapter>() {
 			@Override
 			public Adapter caseSetValuesAdviceConfiguration(SetValuesAdviceConfiguration object) {
 				return createSetValuesAdviceConfigurationAdapter();
@@ -147,13 +147,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration <em>Set Values Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createSetValuesAdviceConfigurationAdapter() {
@@ -161,13 +161,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet <em>Feature To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet
 	 * @generated
 	 */
 	public Adapter createFeatureToSetAdapter() {
@@ -175,13 +175,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue <em>Feature Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue
 	 * @generated
 	 */
 	public Adapter createFeatureValueAdapter() {
@@ -189,13 +189,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue <em>Dynamic Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.DynamicValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.DynamicValue
 	 * @generated
 	 */
 	public Adapter createDynamicValueAdapter() {
@@ -203,13 +203,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue <em>Constant Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ConstantValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.ConstantValue
 	 * @generated
 	 */
 	public Adapter createConstantValueAdapter() {
@@ -217,13 +217,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue <em>List Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.ListValue <em>List Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.ListValue
 	 * @generated
 	 */
 	public Adapter createListValueAdapter() {
@@ -231,13 +231,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue <em>Query Execution Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue
+	 * @see org.eclipse.papyrus.infra.emf.types.advices.values.QueryExecutionValue
 	 * @generated
 	 */
 	public Adapter createQueryExecutionValueAdapter() {
@@ -245,13 +245,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	public Adapter createConfigurationElementAdapter() {
@@ -259,13 +259,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration <em>Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration <em>Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createAdviceConfigurationAdapter() {
@@ -273,13 +273,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	public Adapter createIdentifiedConfigurationAdapter() {
@@ -287,13 +287,13 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractAdviceBindingConfigurationAdapter() {
@@ -312,4 +312,4 @@ public class SetValuesAdviceConfigurationAdapterFactory extends AdapterFactoryIm
 		return null;
 	}
 
-} //SetValuesAdviceConfigurationAdapterFactory
+} //SetValuesAdviceAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationResourceFactoryImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceResourceFactoryImpl.java
index 14faaffcf0f..2878ed651fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceResourceFactoryImpl.java
@@ -1,51 +1,51 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-

-import org.eclipse.emf.ecore.resource.Resource;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource Factory</b> associated with the package.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationResourceImpl

- * @generated

- */

-public class InvariantTypeConfigurationResourceFactoryImpl extends ResourceFactoryImpl {

-	/**

-	 * Creates an instance of the resource factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationResourceFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Resource createResource(URI uri) {

-		Resource result = new InvariantTypeConfigurationResourceImpl(uri);

-		return result;

-	}

-

-} //InvariantTypeConfigurationResourceFactoryImpl

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.emf.types.advices.values.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceResourceImpl
+ * @generated
+ */
+public class SetValuesAdviceResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SetValuesAdviceResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new SetValuesAdviceResourceImpl(uri);
+		return result;
+	}
+
+} //SetValuesAdviceResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationResourceImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceResourceImpl.java
index 650a49797c1..4aba894f779 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationResourceImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.advices.values.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceResourceFactoryImpl
  * @generated
  */
-public class SetValuesAdviceConfigurationResourceImpl extends XMIResourceImpl {
+public class SetValuesAdviceResourceImpl extends XMIResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
@@ -31,8 +31,8 @@ public class SetValuesAdviceConfigurationResourceImpl extends XMIResourceImpl {
 	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationResourceImpl(URI uri) {
+	public SetValuesAdviceResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //SetValuesAdviceConfigurationResourceImpl
+} //SetValuesAdviceResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationSwitch.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceSwitch.java
index b319296945f..8f0981ee0b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationSwitch.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/advices/values/util/SetValuesAdviceSwitch.java
@@ -10,19 +10,19 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.advices.values.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.emf.types.advices.values.*;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.*;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,17 +34,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadvicec
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdvicePackage
  * @generated
  */
-public class SetValuesAdviceConfigurationSwitch<T> extends Switch<T> {
+public class SetValuesAdviceSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static SetValuesAdviceConfigurationPackage modelPackage;
+	protected static SetValuesAdvicePackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -52,9 +52,9 @@ public class SetValuesAdviceConfigurationSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationSwitch() {
+	public SetValuesAdviceSwitch() {
 		if (modelPackage == null) {
-			modelPackage = SetValuesAdviceConfigurationPackage.eINSTANCE;
+			modelPackage = SetValuesAdvicePackage.eINSTANCE;
 		}
 	}
 
@@ -81,7 +81,7 @@ public class SetValuesAdviceConfigurationSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case SetValuesAdviceConfigurationPackage.SET_VALUES_ADVICE_CONFIGURATION: {
+			case SetValuesAdvicePackage.SET_VALUES_ADVICE_CONFIGURATION: {
 				SetValuesAdviceConfiguration setValuesAdviceConfiguration = (SetValuesAdviceConfiguration)theEObject;
 				T result = caseSetValuesAdviceConfiguration(setValuesAdviceConfiguration);
 				if (result == null) result = caseAbstractAdviceBindingConfiguration(setValuesAdviceConfiguration);
@@ -91,40 +91,40 @@ public class SetValuesAdviceConfigurationSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET: {
+			case SetValuesAdvicePackage.FEATURE_TO_SET: {
 				FeatureToSet featureToSet = (FeatureToSet)theEObject;
 				T result = caseFeatureToSet(featureToSet);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SetValuesAdviceConfigurationPackage.FEATURE_VALUE: {
+			case SetValuesAdvicePackage.FEATURE_VALUE: {
 				FeatureValue featureValue = (FeatureValue)theEObject;
 				T result = caseFeatureValue(featureValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SetValuesAdviceConfigurationPackage.DYNAMIC_VALUE: {
+			case SetValuesAdvicePackage.DYNAMIC_VALUE: {
 				DynamicValue dynamicValue = (DynamicValue)theEObject;
 				T result = caseDynamicValue(dynamicValue);
 				if (result == null) result = caseFeatureValue(dynamicValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SetValuesAdviceConfigurationPackage.CONSTANT_VALUE: {
+			case SetValuesAdvicePackage.CONSTANT_VALUE: {
 				ConstantValue constantValue = (ConstantValue)theEObject;
 				T result = caseConstantValue(constantValue);
 				if (result == null) result = caseFeatureValue(constantValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE: {
+			case SetValuesAdvicePackage.LIST_VALUE: {
 				ListValue listValue = (ListValue)theEObject;
 				T result = caseListValue(listValue);
 				if (result == null) result = caseFeatureValue(listValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case SetValuesAdviceConfigurationPackage.QUERY_EXECUTION_VALUE: {
+			case SetValuesAdvicePackage.QUERY_EXECUTION_VALUE: {
 				QueryExecutionValue queryExecutionValue = (QueryExecutionValue)theEObject;
 				T result = caseQueryExecutionValue(queryExecutionValue);
 				if (result == null) result = caseDynamicValue(queryExecutionValue);
@@ -137,13 +137,13 @@ public class SetValuesAdviceConfigurationSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Set Values Advice Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Set Values Advice Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -317,4 +317,4 @@ public class SetValuesAdviceConfigurationSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //SetValuesAdviceConfigurationSwitch
+} //SetValuesAdviceSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/HierarchyPermission.java
index a06c2197bad..c958a836856 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/HierarchyPermission.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/HierarchyPermission.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration;
+package org.eclipse.papyrus.infra.emf.types.rules.container;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,12 +23,12 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType <em>Container Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted <em>Permitted</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict <em>Strict</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#getContainerType <em>Container Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isPermitted <em>Permitted</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isStrict <em>Strict</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission()
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#getHierarchyPermission()
  * @model
  * @generated
  */
@@ -43,14 +43,14 @@ public interface HierarchyPermission extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Container Type</em>' attribute.
 	 * @see #setContainerType(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_ContainerType()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#getHierarchyPermission_ContainerType()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getContainerType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType <em>Container Type</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#getContainerType <em>Container Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Container Type</em>' attribute.
@@ -69,14 +69,14 @@ public interface HierarchyPermission extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Permitted</em>' attribute.
 	 * @see #setPermitted(boolean)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_Permitted()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#getHierarchyPermission_Permitted()
 	 * @model required="true"
 	 * @generated
 	 */
 	boolean isPermitted();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted <em>Permitted</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isPermitted <em>Permitted</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Permitted</em>' attribute.
@@ -95,14 +95,14 @@ public interface HierarchyPermission extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Strict</em>' attribute.
 	 * @see #setStrict(boolean)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getHierarchyPermission_Strict()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#getHierarchyPermission_Strict()
 	 * @model required="true"
 	 * @generated
 	 */
 	boolean isStrict();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict <em>Strict</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isStrict <em>Strict</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Strict</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRuleConfiguration.java
index 83fa2a27e4b..f9a65ff0996 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfiguration.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRuleConfiguration.java
@@ -10,32 +10,32 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration;
+package org.eclipse.papyrus.infra.emf.types.rules.container;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invariant Container Rule Configuration</b></em>'.
+ * A representation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration#getPermissions <em>Permissions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration#getPermissions <em>Permissions</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getInvariantContainerRuleConfiguration()
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#getInvariantContainerRuleConfiguration()
  * @model
  * @generated
  */
-public interface InvariantContainerRuleConfiguration extends InvariantRuleConfiguration {
+public interface InvariantContainerRuleConfiguration extends RuleConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Permissions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Permissions</em>' containment reference list isn't clear,
@@ -43,7 +43,7 @@ public interface InvariantContainerRuleConfiguration extends InvariantRuleConfig
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Permissions</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#getInvariantContainerRuleConfiguration_Permissions()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#getInvariantContainerRuleConfiguration_Permissions()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRuleFactory.java
index ad5cacb0261..fb68ee93054 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRuleFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration;
+package org.eclipse.papyrus.infra.emf.types.rules.container;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,23 +19,23 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage
  * @generated
  */
-public interface InvariantContainerRuleConfigurationFactory extends EFactory {
+public interface InvariantContainerRuleFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InvariantContainerRuleConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationFactoryImpl.init();
+	InvariantContainerRuleFactory eINSTANCE = org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRuleFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Invariant Container Rule Configuration</em>'.
+	 * Returns a new object of class '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Invariant Container Rule Configuration</em>'.
+	 * @return a new object of class '<em>Configuration</em>'.
 	 * @generated
 	 */
 	InvariantContainerRuleConfiguration createInvariantContainerRuleConfiguration();
@@ -56,6 +56,6 @@ public interface InvariantContainerRuleConfigurationFactory extends EFactory {
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	InvariantContainerRuleConfigurationPackage getInvariantContainerRuleConfigurationPackage();
+	InvariantContainerRulePackage getInvariantContainerRulePackage();
 
-} //InvariantContainerRuleConfigurationFactory
+} //InvariantContainerRuleFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRulePackage.java
index 187f9b0d619..aea208459f3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/InvariantContainerRuleConfigurationPackage.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRulePackage.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration;
+package org.eclipse.papyrus.infra.emf.types.rules.container;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,18 +31,18 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationFactory
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleFactory
  * @model kind="package"
  * @generated
  */
-public interface InvariantContainerRuleConfigurationPackage extends EPackage {
+public interface InvariantContainerRulePackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "invariantcontainerruleconfiguration";
+	String eNAME = "container";
 
 	/**
 	 * The package namespace URI.
@@ -50,7 +50,7 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1";
 
 	/**
 	 * The package namespace name.
@@ -58,7 +58,7 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "invariantcontainerruleconfiguration";
+	String eNS_PREFIX = "invariantcontainerrule";
 
 	/**
 	 * The singleton instance of the package.
@@ -66,14 +66,14 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InvariantContainerRuleConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationPackageImpl.init();
+	InvariantContainerRulePackage eINSTANCE = org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRulePackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationImpl <em>Invariant Container Rule Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRuleConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationPackageImpl#getInvariantContainerRuleConfiguration()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRulePackageImpl#getInvariantContainerRuleConfiguration()
 	 * @generated
 	 */
 	int INVARIANT_CONTAINER_RULE_CONFIGURATION = 0;
@@ -85,32 +85,32 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+	int INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS = RuleBasedPackage.RULE_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Invariant Container Rule Configuration</em>' class.
+	 * The number of structural features of the '<em>Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_CONTAINER_RULE_CONFIGURATION_FEATURE_COUNT = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
+	int INVARIANT_CONTAINER_RULE_CONFIGURATION_FEATURE_COUNT = RuleBasedPackage.RULE_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of operations of the '<em>Invariant Container Rule Configuration</em>' class.
+	 * The number of operations of the '<em>Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_CONTAINER_RULE_CONFIGURATION_OPERATION_COUNT = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+	int INVARIANT_CONTAINER_RULE_CONFIGURATION_OPERATION_COUNT = RuleBasedPackage.RULE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationPackageImpl#getHierarchyPermission()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRulePackageImpl#getHierarchyPermission()
 	 * @generated
 	 */
 	int HIERARCHY_PERMISSION = 1;
@@ -162,64 +162,64 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration <em>Invariant Container Rule Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Invariant Container Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration
+	 * @return the meta object for class '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration
 	 * @generated
 	 */
 	EClass getInvariantContainerRuleConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration#getPermissions <em>Permissions</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration#getPermissions <em>Permissions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Permissions</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration#getPermissions()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration#getPermissions()
 	 * @see #getInvariantContainerRuleConfiguration()
 	 * @generated
 	 */
 	EReference getInvariantContainerRuleConfiguration_Permissions();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission <em>Hierarchy Permission</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission <em>Hierarchy Permission</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Hierarchy Permission</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission
 	 * @generated
 	 */
 	EClass getHierarchyPermission();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType <em>Container Type</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#getContainerType <em>Container Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Container Type</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#getContainerType()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#getContainerType()
 	 * @see #getHierarchyPermission()
 	 * @generated
 	 */
 	EAttribute getHierarchyPermission_ContainerType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted <em>Permitted</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isPermitted <em>Permitted</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Permitted</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isPermitted()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isPermitted()
 	 * @see #getHierarchyPermission()
 	 * @generated
 	 */
 	EAttribute getHierarchyPermission_Permitted();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict <em>Strict</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isStrict <em>Strict</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Strict</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission#isStrict()
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission#isStrict()
 	 * @see #getHierarchyPermission()
 	 * @generated
 	 */
@@ -232,7 +232,7 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	InvariantContainerRuleConfigurationFactory getInvariantContainerRuleConfigurationFactory();
+	InvariantContainerRuleFactory getInvariantContainerRuleFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -249,11 +249,11 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationImpl <em>Invariant Container Rule Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRuleConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationPackageImpl#getInvariantContainerRuleConfiguration()
+		 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRulePackageImpl#getInvariantContainerRuleConfiguration()
 		 * @generated
 		 */
 		EClass INVARIANT_CONTAINER_RULE_CONFIGURATION = eINSTANCE.getInvariantContainerRuleConfiguration();
@@ -267,11 +267,11 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 		EReference INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS = eINSTANCE.getInvariantContainerRuleConfiguration_Permissions();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl <em>Hierarchy Permission</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationPackageImpl#getHierarchyPermission()
+		 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl
+		 * @see org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRulePackageImpl#getHierarchyPermission()
 		 * @generated
 		 */
 		EClass HIERARCHY_PERMISSION = eINSTANCE.getHierarchyPermission();
@@ -302,4 +302,4 @@ public interface InvariantContainerRuleConfigurationPackage extends EPackage {
 
 	}
 
-} //InvariantContainerRuleConfigurationPackage
+} //InvariantContainerRulePackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/HierarchyPermissionImpl.java
index 95f49e40be2..b8e2055e715 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/HierarchyPermissionImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/HierarchyPermissionImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.rules.container.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,9 +30,9 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontain
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#getContainerType <em>Container Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#isPermitted <em>Permitted</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.HierarchyPermissionImpl#isStrict <em>Strict</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl#getContainerType <em>Container Type</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl#isPermitted <em>Permitted</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.HierarchyPermissionImpl#isStrict <em>Strict</em>}</li>
  * </ul>
  *
  * @generated
@@ -114,7 +114,7 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION;
+		return InvariantContainerRulePackage.Literals.HIERARCHY_PERMISSION;
 	}
 
 	/**
@@ -135,7 +135,7 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 		String oldContainerType = containerType;
 		containerType = newContainerType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE, oldContainerType, containerType));
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRulePackage.HIERARCHY_PERMISSION__CONTAINER_TYPE, oldContainerType, containerType));
 	}
 
 	/**
@@ -156,7 +156,7 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 		boolean oldPermitted = permitted;
 		permitted = newPermitted;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED, oldPermitted, permitted));
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRulePackage.HIERARCHY_PERMISSION__PERMITTED, oldPermitted, permitted));
 	}
 
 	/**
@@ -177,7 +177,7 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 		boolean oldStrict = strict;
 		strict = newStrict;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT, oldStrict, strict));
+			eNotify(new ENotificationImpl(this, Notification.SET, InvariantContainerRulePackage.HIERARCHY_PERMISSION__STRICT, oldStrict, strict));
 	}
 
 	/**
@@ -188,11 +188,11 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
 				return getContainerType();
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__PERMITTED:
 				return isPermitted();
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__STRICT:
 				return isStrict();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -206,13 +206,13 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
 				setContainerType((String)newValue);
 				return;
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__PERMITTED:
 				setPermitted((Boolean)newValue);
 				return;
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__STRICT:
 				setStrict((Boolean)newValue);
 				return;
 		}
@@ -227,13 +227,13 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
 				setContainerType(CONTAINER_TYPE_EDEFAULT);
 				return;
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__PERMITTED:
 				setPermitted(PERMITTED_EDEFAULT);
 				return;
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__STRICT:
 				setStrict(STRICT_EDEFAULT);
 				return;
 		}
@@ -248,11 +248,11 @@ public class HierarchyPermissionImpl extends MinimalEObjectImpl.Container implem
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
 				return CONTAINER_TYPE_EDEFAULT == null ? containerType != null : !CONTAINER_TYPE_EDEFAULT.equals(containerType);
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__PERMITTED:
 				return permitted != PERMITTED_EDEFAULT;
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__STRICT:
 				return strict != STRICT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/InvariantContainerRuleConfigurationImpl.java
index f8fd98750f5..51524ab7d72 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/InvariantContainerRuleConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.rules.container.impl;
 
 import java.util.Collection;
 
@@ -24,26 +24,26 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl;
+import org.eclipse.papyrus.infra.types.rulebased.impl.RuleConfigurationImpl;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invariant Container Rule Configuration</b></em>'.
+ * An implementation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl.InvariantContainerRuleConfigurationImpl#getPermissions <em>Permissions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.emf.types.rules.container.impl.InvariantContainerRuleConfigurationImpl#getPermissions <em>Permissions</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements InvariantContainerRuleConfiguration {
+public class InvariantContainerRuleConfigurationImpl extends RuleConfigurationImpl implements InvariantContainerRuleConfiguration {
 	/**
 	 * The cached value of the '{@link #getPermissions() <em>Permissions</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -70,7 +70,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return InvariantContainerRuleConfigurationPackage.Literals.INVARIANT_CONTAINER_RULE_CONFIGURATION;
+		return InvariantContainerRulePackage.Literals.INVARIANT_CONTAINER_RULE_CONFIGURATION;
 	}
 
 	/**
@@ -80,7 +80,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	 */
 	public EList<HierarchyPermission> getPermissions() {
 		if (permissions == null) {
-			permissions = new EObjectContainmentEList<HierarchyPermission>(HierarchyPermission.class, this, InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS);
+			permissions = new EObjectContainmentEList<HierarchyPermission>(HierarchyPermission.class, this, InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS);
 		}
 		return permissions;
 	}
@@ -93,7 +93,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
 				return ((InternalEList<?>)getPermissions()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -107,7 +107,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
 				return getPermissions();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -122,7 +122,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
 				getPermissions().clear();
 				getPermissions().addAll((Collection<? extends HierarchyPermission>)newValue);
 				return;
@@ -138,7 +138,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
 				getPermissions().clear();
 				return;
 		}
@@ -153,7 +153,7 @@ public class InvariantContainerRuleConfigurationImpl extends InvariantRuleConfig
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
 				return permissions != null && !permissions.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationFactoryImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/InvariantContainerRuleFactoryImpl.java
index 6132f190a0a..e806ed8cf5a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationFactoryImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/InvariantContainerRuleFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.rules.container.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.*;
+import org.eclipse.papyrus.infra.emf.types.rules.container.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,24 +28,24 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontain
  * <!-- end-user-doc -->
  * @generated
  */
-public class InvariantContainerRuleConfigurationFactoryImpl extends EFactoryImpl implements InvariantContainerRuleConfigurationFactory {
+public class InvariantContainerRuleFactoryImpl extends EFactoryImpl implements InvariantContainerRuleFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static InvariantContainerRuleConfigurationFactory init() {
+	public static InvariantContainerRuleFactory init() {
 		try {
-			InvariantContainerRuleConfigurationFactory theInvariantContainerRuleConfigurationFactory = (InvariantContainerRuleConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(InvariantContainerRuleConfigurationPackage.eNS_URI);
-			if (theInvariantContainerRuleConfigurationFactory != null) {
-				return theInvariantContainerRuleConfigurationFactory;
+			InvariantContainerRuleFactory theInvariantContainerRuleFactory = (InvariantContainerRuleFactory)EPackage.Registry.INSTANCE.getEFactory(InvariantContainerRulePackage.eNS_URI);
+			if (theInvariantContainerRuleFactory != null) {
+				return theInvariantContainerRuleFactory;
 			}
 		}
 		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new InvariantContainerRuleConfigurationFactoryImpl();
+		return new InvariantContainerRuleFactoryImpl();
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class InvariantContainerRuleConfigurationFactoryImpl extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationFactoryImpl() {
+	public InvariantContainerRuleFactoryImpl() {
 		super();
 	}
 
@@ -66,8 +66,8 @@ public class InvariantContainerRuleConfigurationFactoryImpl extends EFactoryImpl
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION: return createInvariantContainerRuleConfiguration();
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION: return createHierarchyPermission();
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION: return createInvariantContainerRuleConfiguration();
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION: return createHierarchyPermission();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -98,8 +98,8 @@ public class InvariantContainerRuleConfigurationFactoryImpl extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationPackage getInvariantContainerRuleConfigurationPackage() {
-		return (InvariantContainerRuleConfigurationPackage)getEPackage();
+	public InvariantContainerRulePackage getInvariantContainerRulePackage() {
+		return (InvariantContainerRulePackage)getEPackage();
 	}
 
 	/**
@@ -109,8 +109,8 @@ public class InvariantContainerRuleConfigurationFactoryImpl extends EFactoryImpl
 	 * @generated
 	 */
 	@Deprecated
-	public static InvariantContainerRuleConfigurationPackage getPackage() {
-		return InvariantContainerRuleConfigurationPackage.eINSTANCE;
+	public static InvariantContainerRulePackage getPackage() {
+		return InvariantContainerRulePackage.eINSTANCE;
 	}
 
-} //InvariantContainerRuleConfigurationFactoryImpl
+} //InvariantContainerRuleFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/InvariantContainerRulePackageImpl.java
index 0a84b839964..7ba5cdde554 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/impl/InvariantContainerRuleConfigurationPackageImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/impl/InvariantContainerRulePackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl;
+package org.eclipse.papyrus.infra.emf.types.rules.container.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,12 +20,12 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleFactory;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  * <!-- end-user-doc -->
  * @generated
  */
-public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl implements InvariantContainerRuleConfigurationPackage {
+public class InvariantContainerRulePackageImpl extends EPackageImpl implements InvariantContainerRulePackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -59,12 +59,12 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private InvariantContainerRuleConfigurationPackageImpl() {
-		super(eNS_URI, InvariantContainerRuleConfigurationFactory.eINSTANCE);
+	private InvariantContainerRulePackageImpl() {
+		super(eNS_URI, InvariantContainerRuleFactory.eINSTANCE);
 	}
 
 	/**
@@ -77,7 +77,7 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link InvariantContainerRuleConfigurationPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link InvariantContainerRulePackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -86,30 +86,30 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static InvariantContainerRuleConfigurationPackage init() {
-		if (isInited) return (InvariantContainerRuleConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(InvariantContainerRuleConfigurationPackage.eNS_URI);
+	public static InvariantContainerRulePackage init() {
+		if (isInited) return (InvariantContainerRulePackage)EPackage.Registry.INSTANCE.getEPackage(InvariantContainerRulePackage.eNS_URI);
 
 		// Obtain or create and register package
-		InvariantContainerRuleConfigurationPackageImpl theInvariantContainerRuleConfigurationPackage = (InvariantContainerRuleConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantContainerRuleConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InvariantContainerRuleConfigurationPackageImpl());
+		InvariantContainerRulePackageImpl theInvariantContainerRulePackage = (InvariantContainerRulePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantContainerRulePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InvariantContainerRulePackageImpl());
 
 		isInited = true;
 
 		// Initialize simple dependencies
-		InvariantTypeConfigurationPackage.eINSTANCE.eClass();
+		RuleBasedPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
-		theInvariantContainerRuleConfigurationPackage.createPackageContents();
+		theInvariantContainerRulePackage.createPackageContents();
 
 		// Initialize created meta-data
-		theInvariantContainerRuleConfigurationPackage.initializePackageContents();
+		theInvariantContainerRulePackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		theInvariantContainerRuleConfigurationPackage.freeze();
+		theInvariantContainerRulePackage.freeze();
 
   
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(InvariantContainerRuleConfigurationPackage.eNS_URI, theInvariantContainerRuleConfigurationPackage);
-		return theInvariantContainerRuleConfigurationPackage;
+		EPackage.Registry.INSTANCE.put(InvariantContainerRulePackage.eNS_URI, theInvariantContainerRulePackage);
+		return theInvariantContainerRulePackage;
 	}
 
 	/**
@@ -171,8 +171,8 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationFactory getInvariantContainerRuleConfigurationFactory() {
-		return (InvariantContainerRuleConfigurationFactory)getEFactoryInstance();
+	public InvariantContainerRuleFactory getInvariantContainerRuleFactory() {
+		return (InvariantContainerRuleFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -227,7 +227,7 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		InvariantTypeConfigurationPackage theInvariantTypeConfigurationPackage = (InvariantTypeConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(InvariantTypeConfigurationPackage.eNS_URI);
+		RuleBasedPackage theRuleBasedPackage = (RuleBasedPackage)EPackage.Registry.INSTANCE.getEPackage(RuleBasedPackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Create type parameters
@@ -235,7 +235,7 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		invariantContainerRuleConfigurationEClass.getESuperTypes().add(theInvariantTypeConfigurationPackage.getInvariantRuleConfiguration());
+		invariantContainerRuleConfigurationEClass.getESuperTypes().add(theRuleBasedPackage.getRuleConfiguration());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(invariantContainerRuleConfigurationEClass, InvariantContainerRuleConfiguration.class, "InvariantContainerRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -250,4 +250,4 @@ public class InvariantContainerRuleConfigurationPackageImpl extends EPackageImpl
 		createResource(eNS_URI);
 	}
 
-} //InvariantContainerRuleConfigurationPackageImpl
+} //InvariantContainerRulePackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/HierarchyPermissionItemProvider.java
index 17a62988d67..3782ac2db78 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/HierarchyPermissionItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/HierarchyPermissionItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.rules.container.provider;
 
 
 import java.util.Collection;
@@ -32,11 +32,11 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -90,7 +90,7 @@ public class HierarchyPermissionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_HierarchyPermission_containerType_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_containerType_feature", "_UI_HierarchyPermission_type"),
-				 InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__CONTAINER_TYPE,
+				 InvariantContainerRulePackage.Literals.HIERARCHY_PERMISSION__CONTAINER_TYPE,
 				 true,
 				 false,
 				 false,
@@ -112,7 +112,7 @@ public class HierarchyPermissionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_HierarchyPermission_permitted_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_permitted_feature", "_UI_HierarchyPermission_type"),
-				 InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__PERMITTED,
+				 InvariantContainerRulePackage.Literals.HIERARCHY_PERMISSION__PERMITTED,
 				 true,
 				 false,
 				 false,
@@ -134,7 +134,7 @@ public class HierarchyPermissionItemProvider
 				 getResourceLocator(),
 				 getString("_UI_HierarchyPermission_strict_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_HierarchyPermission_strict_feature", "_UI_HierarchyPermission_type"),
-				 InvariantContainerRuleConfigurationPackage.Literals.HIERARCHY_PERMISSION__STRICT,
+				 InvariantContainerRulePackage.Literals.HIERARCHY_PERMISSION__STRICT,
 				 true,
 				 false,
 				 false,
@@ -181,9 +181,9 @@ public class HierarchyPermissionItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(HierarchyPermission.class)) {
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__PERMITTED:
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION__STRICT:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__CONTAINER_TYPE:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__PERMITTED:
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION__STRICT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -210,7 +210,7 @@ public class HierarchyPermissionItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return InvariantContainerRuleConfigurationEditPlugin.INSTANCE;
+		return InvariantContainerRuleEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProvider.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/InvariantContainerRuleConfigurationItemProvider.java
index dcd422ca2f8..a6209fc9d28 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProvider.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/InvariantContainerRuleConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.rules.container.provider;
 
 
 import java.util.Collection;
@@ -26,19 +26,19 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleFactory;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantRuleConfigurationItemProvider;
+import org.eclipse.papyrus.infra.types.rulebased.provider.RuleConfigurationItemProvider;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class InvariantContainerRuleConfigurationItemProvider extends InvariantRuleConfigurationItemProvider {
+public class InvariantContainerRuleConfigurationItemProvider extends RuleConfigurationItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -76,7 +76,7 @@ public class InvariantContainerRuleConfigurationItemProvider extends InvariantRu
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(InvariantContainerRuleConfigurationPackage.Literals.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS);
+			childrenFeatures.add(InvariantContainerRulePackage.Literals.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS);
 		}
 		return childrenFeatures;
 	}
@@ -129,7 +129,7 @@ public class InvariantContainerRuleConfigurationItemProvider extends InvariantRu
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(InvariantContainerRuleConfiguration.class)) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -149,8 +149,8 @@ public class InvariantContainerRuleConfigurationItemProvider extends InvariantRu
 
 		newChildDescriptors.add
 			(createChildParameter
-				(InvariantContainerRuleConfigurationPackage.Literals.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS,
-				 InvariantContainerRuleConfigurationFactory.eINSTANCE.createHierarchyPermission()));
+				(InvariantContainerRulePackage.Literals.INVARIANT_CONTAINER_RULE_CONFIGURATION__PERMISSIONS,
+				 InvariantContainerRuleFactory.eINSTANCE.createHierarchyPermission()));
 	}
 
 	/**
@@ -161,7 +161,7 @@ public class InvariantContainerRuleConfigurationItemProvider extends InvariantRu
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return InvariantContainerRuleConfigurationEditPlugin.INSTANCE;
+		return InvariantContainerRuleEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationEditPlugin.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/InvariantContainerRuleEditPlugin.java
index 654d6447c5d..88479e4bda8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationEditPlugin.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/InvariantContainerRuleEditPlugin.java
@@ -1,105 +1,108 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;

-

-/**

- * This is the central singleton for the InvariantTypeConfiguration edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public final class InvariantTypeConfigurationEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final InvariantTypeConfigurationEditPlugin INSTANCE = new InvariantTypeConfigurationEditPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationEditPlugin() {

-		super

-		  (new ResourceLocator [] {

-		     EcoreEditPlugin.INSTANCE,

-		     ElementTypesConfigurationsEditPlugin.INSTANCE,

-		   });

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.emf.types.rules.container.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+import org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin;
+
+/**
+ * This is the central singleton for the InvariantContainerRule edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class InvariantContainerRuleEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final InvariantContainerRuleEditPlugin INSTANCE = new InvariantContainerRuleEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public InvariantContainerRuleEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     EcoreEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		     RuleBasedEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/InvariantContainerRuleItemProviderAdapterFactory.java
index 7017db0632b..d41f5134c93 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/provider/InvariantContainerRuleItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider;
+package org.eclipse.papyrus.infra.emf.types.rules.container.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,16 +41,15 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationFactory;
+import org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util.InvariantContainerRuleConfigurationAdapterFactory;
+import org.eclipse.papyrus.infra.emf.types.rules.container.util.InvariantContainerRuleAdapterFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationSwitch;
+import org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedSwitch;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -61,7 +60,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  * <!-- end-user-doc -->
  * @generated
  */
-public class InvariantContainerRuleConfigurationItemProviderAdapterFactory extends InvariantContainerRuleConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class InvariantContainerRuleItemProviderAdapterFactory extends InvariantContainerRuleAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -92,7 +91,7 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationItemProviderAdapterFactory() {
+	public InvariantContainerRuleItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -101,7 +100,7 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -109,7 +108,7 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 	protected InvariantContainerRuleConfigurationItemProvider invariantContainerRuleConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -124,7 +123,7 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -132,7 +131,7 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 	protected HierarchyPermissionItemProvider hierarchyPermissionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -250,19 +249,19 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 	}
 
 	/**
-	 * A child creation extender for the {@link InvariantTypeConfigurationPackage}.
+	 * A child creation extender for the {@link RuleBasedPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class InvariantTypeConfigurationChildCreationExtender implements IChildCreationExtender {
+	public static class RuleBasedChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends InvariantTypeConfigurationSwitch<Object> {
+		protected static class CreationSwitch extends RuleBasedSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -295,11 +294,11 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 			 * @generated
 			 */
 			@Override
-			public Object caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {
+			public Object caseRuleBasedTypeConfiguration(RuleBasedTypeConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
-						 InvariantContainerRuleConfigurationFactory.eINSTANCE.createInvariantContainerRuleConfiguration()));
+						(RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION,
+						 InvariantContainerRuleFactory.eINSTANCE.createInvariantContainerRuleConfiguration()));
 
 				return null;
 			}
@@ -310,26 +309,11 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 			 * @generated
 			 */
 			@Override
-			public Object caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {
+			public Object caseCompositeRuleConfiguration(CompositeRuleConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,
-						 InvariantContainerRuleConfigurationFactory.eINSTANCE.createInvariantContainerRuleConfiguration()));
-
-				return null;
-			}
- 
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
-				newChildDescriptors.add
-					(createChildParameter
-						(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
-						 InvariantContainerRuleConfigurationFactory.eINSTANCE.createInvariantContainerRuleConfiguration()));
+						(RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES,
+						 InvariantContainerRuleFactory.eINSTANCE.createInvariantContainerRuleConfiguration()));
 
 				return null;
 			}
@@ -362,7 +346,7 @@ public class InvariantContainerRuleConfigurationItemProviderAdapterFactory exten
 		 * @generated
 		 */
 		public ResourceLocator getResourceLocator() {
-			return InvariantContainerRuleConfigurationEditPlugin.INSTANCE;
+			return InvariantContainerRuleEditPlugin.INSTANCE;
 		}
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationAdapterFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleAdapterFactory.java
index 9268c6d6335..42d74d71e86 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationAdapterFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.rules.container.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,26 +19,26 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.*;
+import org.eclipse.papyrus.infra.emf.types.rules.container.*;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage
  * @generated
  */
-public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFactoryImpl {
+public class InvariantContainerRuleAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static InvariantContainerRuleConfigurationPackage modelPackage;
+	protected static InvariantContainerRulePackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -46,9 +46,9 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationAdapterFactory() {
+	public InvariantContainerRuleAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = InvariantContainerRuleConfigurationPackage.eINSTANCE;
+			modelPackage = InvariantContainerRulePackage.eINSTANCE;
 		}
 	}
 
@@ -77,8 +77,8 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected InvariantContainerRuleConfigurationSwitch<Adapter> modelSwitch =
-		new InvariantContainerRuleConfigurationSwitch<Adapter>() {
+	protected InvariantContainerRuleSwitch<Adapter> modelSwitch =
+		new InvariantContainerRuleSwitch<Adapter>() {
 			@Override
 			public Adapter caseInvariantContainerRuleConfiguration(InvariantContainerRuleConfiguration object) {
 				return createInvariantContainerRuleConfigurationAdapter();
@@ -88,8 +88,8 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 				return createHierarchyPermissionAdapter();
 			}
 			@Override
-			public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-				return createInvariantRuleConfigurationAdapter();
+			public Adapter caseRuleConfiguration(RuleConfiguration object) {
+				return createRuleConfigurationAdapter();
 			}
 			@Override
 			public Adapter defaultCase(EObject object) {
@@ -112,13 +112,13 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration <em>Invariant Container Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRuleConfiguration
 	 * @generated
 	 */
 	public Adapter createInvariantContainerRuleConfigurationAdapter() {
@@ -126,13 +126,13 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission <em>Hierarchy Permission</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission <em>Hierarchy Permission</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission
+	 * @see org.eclipse.papyrus.infra.emf.types.rules.container.HierarchyPermission
 	 * @generated
 	 */
 	public Adapter createHierarchyPermissionAdapter() {
@@ -140,16 +140,16 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration <em>Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration
 	 * @generated
 	 */
-	public Adapter createInvariantRuleConfigurationAdapter() {
+	public Adapter createRuleConfigurationAdapter() {
 		return null;
 	}
 
@@ -165,4 +165,4 @@ public class InvariantContainerRuleConfigurationAdapterFactory extends AdapterFa
 		return null;
 	}
 
-} //InvariantContainerRuleConfigurationAdapterFactory
+} //InvariantContainerRuleAdapterFactory
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceFactoryImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleResourceFactoryImpl.java
index f56607c7dfb..e0fa0a8c6ea 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceFactoryImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.rules.container.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,17 +22,17 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceImpl
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.util.InvariantContainerRuleResourceImpl
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+public class InvariantContainerRuleResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationResourceFactoryImpl() {
+	public InvariantContainerRuleResourceFactoryImpl() {
 		super();
 	}
 
@@ -44,8 +44,8 @@ public class ApplyStereotypeAdviceConfigurationResourceFactoryImpl extends Resou
 	 */
 	@Override
 	public Resource createResource(URI uri) {
-		Resource result = new ApplyStereotypeAdviceConfigurationResourceImpl(uri);
+		Resource result = new InvariantContainerRuleResourceImpl(uri);
 		return result;
 	}
 
-} //ApplyStereotypeAdviceConfigurationResourceFactoryImpl
+} //InvariantContainerRuleResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationResourceImpl.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleResourceImpl.java
index ffe2ee8e958..5e1deb77e11 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationResourceImpl.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleResourceImpl.java
@@ -1,38 +1,38 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util;

-

-import org.eclipse.emf.common.util.URI;

-

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Resource </b> associated with the package.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationResourceFactoryImpl

- * @generated

- */

-public class InvariantTypeConfigurationResourceImpl extends XMIResourceImpl {

-	/**

-	 * Creates an instance of the resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param uri the URI of the new resource.

-	 * @generated

-	 */

-	public InvariantTypeConfigurationResourceImpl(URI uri) {

-		super(uri);

-	}

-

-} //InvariantTypeConfigurationResourceImpl

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.emf.types.rules.container.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.util.InvariantContainerRuleResourceFactoryImpl
+ * @generated
+ */
+public class InvariantContainerRuleResourceImpl extends XMIResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public InvariantContainerRuleResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} //InvariantContainerRuleResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleSwitch.java
index 392097aac1f..23df2e584ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationSwitch.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src-gen/org/eclipse/papyrus/infra/emf/types/rules/container/util/InvariantContainerRuleSwitch.java
@@ -10,16 +10,16 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util;
+package org.eclipse.papyrus.infra.emf.types.rules.container.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.*;
+import org.eclipse.papyrus.infra.emf.types.rules.container.*;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,17 +31,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage
+ * @see org.eclipse.papyrus.infra.emf.types.rules.container.InvariantContainerRulePackage
  * @generated
  */
-public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
+public class InvariantContainerRuleSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static InvariantContainerRuleConfigurationPackage modelPackage;
+	protected static InvariantContainerRulePackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -49,9 +49,9 @@ public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationSwitch() {
+	public InvariantContainerRuleSwitch() {
 		if (modelPackage == null) {
-			modelPackage = InvariantContainerRuleConfigurationPackage.eINSTANCE;
+			modelPackage = InvariantContainerRulePackage.eINSTANCE;
 		}
 	}
 
@@ -78,14 +78,14 @@ public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case InvariantContainerRuleConfigurationPackage.INVARIANT_CONTAINER_RULE_CONFIGURATION: {
+			case InvariantContainerRulePackage.INVARIANT_CONTAINER_RULE_CONFIGURATION: {
 				InvariantContainerRuleConfiguration invariantContainerRuleConfiguration = (InvariantContainerRuleConfiguration)theEObject;
 				T result = caseInvariantContainerRuleConfiguration(invariantContainerRuleConfiguration);
-				if (result == null) result = caseInvariantRuleConfiguration(invariantContainerRuleConfiguration);
+				if (result == null) result = caseRuleConfiguration(invariantContainerRuleConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InvariantContainerRuleConfigurationPackage.HIERARCHY_PERMISSION: {
+			case InvariantContainerRulePackage.HIERARCHY_PERMISSION: {
 				HierarchyPermission hierarchyPermission = (HierarchyPermission)theEObject;
 				T result = caseHierarchyPermission(hierarchyPermission);
 				if (result == null) result = defaultCase(theEObject);
@@ -96,13 +96,13 @@ public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Container Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Container Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -126,17 +126,17 @@ public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+	public T caseRuleConfiguration(RuleConfiguration object) {
 		return null;
 	}
 
@@ -156,4 +156,4 @@ public class InvariantContainerRuleConfigurationSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //InvariantContainerRuleConfigurationSwitch
+} //InvariantContainerRuleSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/Activator.java
index e86be8d48d6..62dff127aeb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/Activator.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/Activator.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 485220

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf;

+package org.eclipse.papyrus.infra.emf.types;

 

 import org.eclipse.core.runtime.Plugin;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.emf"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf.types"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator INSTANCE;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/FeatureValueUtils.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValueUtils.java
index e6298035cf7..987121783e5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/FeatureValueUtils.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/FeatureValueUtils.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;

+package org.eclipse.papyrus.infra.emf.types.advices.values;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EEnum;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter.ConverterNotfoundException;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter.ConverterRegistry;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationSwitch;

+import org.eclipse.papyrus.infra.emf.types.Activator;

+import org.eclipse.papyrus.infra.emf.types.advices.values.util.SetValuesAdviceSwitch;

+import org.eclipse.papyrus.infra.emf.types.converter.ConverterNotfoundException;

+import org.eclipse.papyrus.infra.emf.types.converter.ConverterRegistry;

 import org.eclipse.uml2.uml.DataType;

 import org.eclipse.uml2.uml.InstanceValue;

 import org.eclipse.uml2.uml.ValueSpecification;

@@ -51,7 +51,7 @@ public class FeatureValueUtils {
 	 */

 	public static Object getValue(final EObject elementToConfigure, final EStructuralFeature feature, final FeatureValue featureValue) {

 

-		Object result = new SetValuesAdviceConfigurationSwitch<Object>() {

+		Object result = new SetValuesAdviceSwitch<Object>() {

 			/**

 			 * {@inheritDoc}

 			 */

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdvice.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdvice.java
index 3a2b92fb5e7..e092aaeb03e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdvice.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdvice.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;

+package org.eclipse.papyrus.infra.emf.types.advices.values;

 

 import java.util.HashMap;

 import java.util.Map;

@@ -24,7 +24,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.Activator;

+import org.eclipse.papyrus.infra.emf.types.Activator;

+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureToSet;

+import org.eclipse.papyrus.infra.emf.types.advices.values.FeatureValue;

+import org.eclipse.papyrus.infra.emf.types.advices.values.SetValuesAdviceConfiguration;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdviceFactory.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdviceFactory.java
index 85f7146e0fa..7b3b8f70fce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/SetValuesAdviceEditHelperAdviceFactory.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/advices/values/SetValuesAdviceEditHelperAdviceFactory.java
@@ -1,31 +1,31 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
-
-public class SetValuesAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {
-
-	@Override
-	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {
-		if (adviceConfiguration instanceof SetValuesAdviceConfiguration) {
-			IEditHelperAdvice editHelperAdvice = new SetValuesAdviceEditHelperAdvice((SetValuesAdviceConfiguration) adviceConfiguration);
-			return editHelperAdvice;
-		}
-		return NullEditHelperAdvice.getInstance();
-	}
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.emf.types.advices.values;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;

+import org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceBindingFactory;

+import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;

+

+public class SetValuesAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {

+

+	@Override

+	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {

+		if (adviceConfiguration instanceof SetValuesAdviceConfiguration) {

+			IEditHelperAdvice editHelperAdvice = new SetValuesAdviceEditHelperAdvice((SetValuesAdviceConfiguration) adviceConfiguration);

+			return editHelperAdvice;

+		}

+		return NullEditHelperAdvice.getInstance();

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ConverterNotfoundException.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterNotfoundException.java
index e8f9ff469cf..38ab545e7c2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ConverterNotfoundException.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterNotfoundException.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.uml2.uml.ValueSpecification;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ConverterRegistry.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterRegistry.java
index 85b3369ebbe..774f98cf2e9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ConverterRegistry.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ConverterRegistry.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import java.util.HashMap;

 import java.util.Map;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ObjectToBooleanConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ObjectToBooleanConverter.java
index a189dba5698..774a9014785 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ObjectToBooleanConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ObjectToBooleanConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ObjectToIntegerConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ObjectToIntegerConverter.java
index cf181dc5dab..2f0c6261b16 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ObjectToIntegerConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ObjectToIntegerConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToBooleanConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToBooleanConverter.java
index b488ae6d0af..2ef9413ddcf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToBooleanConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToBooleanConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToEENumConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEENumConverter.java
index 5ba2b1c4302..99fc4eabdca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToEENumConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEENumConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

@@ -42,7 +42,7 @@ public class ValueSpecificationToEENumConverter extends Converter implements ICo
 			if (instanceSpecification instanceof EnumerationLiteral) {

 

 

-				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();

+//				Class<?> eclass = ((EnumerationLiteral) instanceSpecification).getEnumeration().eClass().getInstanceClass();

 

 

 				// final EEnumLiteral literal = eenum.getEEnumLiteral(umlLiteral.getName());

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToEnumerationConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEnumerationConverter.java
index 536fe3efd62..c3b05bce503 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToEnumerationConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToEnumerationConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToIntegerConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToIntegerConverter.java
index 9b7072b21b4..1c312b72a4d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToIntegerConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToIntegerConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToStringConverter.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToStringConverter.java
index 37148dc0109..651508a1f45 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/converter/ValueSpecificationToStringConverter.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/converter/ValueSpecificationToStringConverter.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter;

+package org.eclipse.papyrus.infra.emf.types.converter;

 

 import org.eclipse.core.databinding.conversion.Converter;

 import org.eclipse.core.databinding.conversion.IConverter;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRule.java
index ded8bac568b..337222bbc6a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerconfiguration/InvariantContainerRule.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types/src/org/eclipse/papyrus/infra/emf/types/rules/container/InvariantContainerRule.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration;
+package org.eclipse.papyrus.infra.emf.types.rules.container;
 
 import java.util.Arrays;
 
@@ -24,15 +24,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.HierarchyPermission;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule;
+import org.eclipse.papyrus.infra.emf.types.Activator;
 import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
+import org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule;
 
 @SuppressWarnings("restriction")
-public class InvariantContainerRule extends AbstractInvariantRule<InvariantContainerRuleConfiguration> {
+public class InvariantContainerRule extends AbstractRule<InvariantContainerRuleConfiguration> {
 
 	protected boolean approveCreationRequest(ConfiguredHintedSpecializationElementType typeToCreate, CreateElementRequest request) {
 		EObject newContainer = request.getContainer();
@@ -114,12 +112,7 @@ public class InvariantContainerRule extends AbstractInvariantRule<InvariantConta
 		return isValid;
 	}
 
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#matches(org.eclipse.emf.ecore.EObject)
-	 *
-	 * @param eObject
-	 * @return
-	 */
+
 	@Override
 	public boolean matches(EObject eObject) {
 		EObject container = eObject.eContainer();
diff --git a/plugins/infra/emf/pom.xml b/plugins/infra/emf/pom.xml
index b64c1d01e8b..c6e3563ec31 100644
--- a/plugins/infra/emf/pom.xml
+++ b/plugins/infra/emf/pom.xml
@@ -18,5 +18,7 @@
 		<module>org.eclipse.papyrus.infra.emf.gmf</module>
 		<module>org.eclipse.papyrus.infra.emf.readonly</module>
 		<module>org.eclipse.papyrus.infra.ui.emf</module>
+		<module>org.eclipse.papyrus.infra.emf.types</module>
+		<module>org.eclipse.papyrus.infra.emf.types.ui</module>
 	</modules>
 </project>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index e20390c551d..893df0dbd6e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -84,7 +84,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.draw2d.ui.render.awt,
  org.apache.xerces;bundle-version="2.9.0",
  org.eclipse.core.runtime,
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
index 6db8bf14e5f..0d813f220da 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="NotationElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" name="GMF::Diagram" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.gmfdiag.common.NotationElementTypeSet" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="NotationElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" identifier="org.eclipse.papyrus.gmfdiag.common.Diagram" name="GMF::Diagram" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.ecore#//Diagram"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index 7161ddd10cd..bb6e319922c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -451,7 +451,7 @@
    </paletteProvider>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/notation.elementtypesconfigurations">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionModelValidationUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionModelValidationUtil.java
index 71d105f4c95..443988ac5f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionModelValidationUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansionmodel/ExpansionModelValidationUtil.java
@@ -22,9 +22,9 @@ import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.DiagnosticChain;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeConfigurationTypeRegistry;

 import org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.util.ExpansionmodelValidator;

 import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeConfigurationTypeRegistry;

 

 /**

  * This utility class has been added in order to ensure that model is well built.

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
index cf6ad196938..fbb22f08228 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DefaultEditHelper.java
@@ -36,13 +36,13 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.AbstractNotifierEditHelper;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.AdviceComparator;
 import org.eclipse.papyrus.infra.emf.commands.UnsetValueCommand;
 import org.eclipse.papyrus.infra.emf.requests.UnsetRequest;
 import org.eclipse.papyrus.infra.gmfdiag.common.commands.CreateEditBasedElementCommand;
 import org.eclipse.papyrus.infra.services.edit.utils.CacheRegistry;
 import org.eclipse.papyrus.infra.services.edit.utils.IRequestCacheEntries;
+import org.eclipse.papyrus.infra.types.core.notification.AbstractNotifierEditHelper;
+import org.eclipse.papyrus.infra.types.core.utils.AdviceComparator;
 
 /**
  * <pre>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.project b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.project
deleted file mode 100644
index 60a1ae9234d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.edit</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 63b6471dde3..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.provider

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.edit;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/NamedConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/NamedConfigurationItemProvider.java
deleted file mode 100644
index 56e4fa57bce..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/NamedConfigurationItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NamedConfigurationItemProvider 
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NamedConfigurationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NamedConfiguration_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NamedConfiguration_name_feature", "_UI_NamedConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.NAMED_CONFIGURATION__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns NamedConfiguration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NamedConfiguration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((NamedConfiguration)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_NamedConfiguration_type") :
-			getString("_UI_NamedConfiguration_type") + " " + label;
-	}
-	
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(NamedConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.NAMED_CONFIGURATION__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.project b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.project
deleted file mode 100644
index ba488e216a4..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.editor</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f0b53a0e2e..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.presentation

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources;visibility:=reexport,

- org.eclipse.emf.ecore.xmi;visibility:=reexport,

- org.eclipse.emf.edit.ui;visibility:=reexport,

- org.eclipse.ui.ide;visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;bundle-version="1.2.0";visibility:=reexport

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.presentation.ElementTypesConfigurationsEditorPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.editor;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml
deleted file mode 100644
index 18f2a8eb0da..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.editor</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ec56f75dbe6..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin$Implementation
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.papyrus.infra.properties;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.properties.edit;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui;x-internal:=true,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;x-internal:=true,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.provider,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore
deleted file mode 100644
index 293b641ddaf..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.ecore
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="runtimevalueseditionadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1"
-    nsPrefix="runtimevalueseditionadviceconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="RuntimeValuesEditionAdviceConfiguration"
-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewsToDisplay" upperBound="-1"
-        eType="#//ViewToDisplay" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ViewToDisplay">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="view" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.properties/Model/Properties.ecore#//contexts/View"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel
deleted file mode 100644
index 6db547d5874..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/model/RuntimeValuesEditionAdviceConfiguration.genmodel
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen"
-    editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen"
-    editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" modelName="RuntimeValuesEditionAdviceConfiguration"
-    editPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider.RuntimeValuesEditionAdviceConfigurationEditPlugin"
-    editorPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.presentation.RuntimeValuesEditionAdviceConfigurationEditorPlugin"
-    testSuiteClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.tests.RuntimeValuesEditionAdviceConfigurationAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui" usedGenPackages="../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations ../../org.eclipse.papyrus.infra.properties/Model/Properties.genmodel#//properties">
-  <foreignModel>RuntimeValuesEditionAdviceConfiguration.ecore</foreignModel>
-  <genPackages prefix="Runtimevalueseditionadviceconfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui"
-      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"
-      ecorePackage="RuntimeValuesEditionAdviceConfiguration.ecore#/">
-    <genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuntimeValuesEditionAdviceConfiguration.ecore#//RuntimeValuesEditionAdviceConfiguration/viewsToDisplay"/>
-    </genClasses>
-    <genClasses ecoreClass="RuntimeValuesEditionAdviceConfiguration.ecore#//ViewToDisplay">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuntimeValuesEditionAdviceConfiguration.ecore#//ViewToDisplay/view"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.xml
deleted file mode 100644
index 432a98820ac..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/plugin.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2014 CEA LIST.
- 
- 
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- 
- Contributors:
-  CEA LIST - Initial API and implementation
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage"
-            genModel="model/RuntimeValuesEditionAdviceConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
-      <parser
-            type="runtimevalueseditionadviceconfiguration"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.provider.RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated RuntimeValuesEditionAdviceConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.provider.RuntimevalueseditionadviceconfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">
-      <adviceConfigurationType
-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration"
-            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice.RuntimeValuesEditionAdviceEditHelperAdviceFactory">
-      </adviceConfigurationType>
-   </extension>
-
-</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml
deleted file mode 100644
index c9cb43cafa6..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java
deleted file mode 100644
index efc24539514..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimeValuesEditionAdviceConfiguration.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Runtime Values Edition Advice Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration#getViewsToDisplay <em>Views To Display</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getRuntimeValuesEditionAdviceConfiguration()
- * @model
- * @generated
- */
-public interface RuntimeValuesEditionAdviceConfiguration extends AbstractAdviceBindingConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Views To Display</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Views To Display</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Views To Display</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<ViewToDisplay> getViewsToDisplay();
-
-} // RuntimeValuesEditionAdviceConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationFactory.java
deleted file mode 100644
index a9638dfb876..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage
- * @generated
- */
-public interface RuntimevalueseditionadviceconfigurationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RuntimevalueseditionadviceconfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Runtime Values Edition Advice Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Runtime Values Edition Advice Configuration</em>'.
-	 * @generated
-	 */
-	RuntimeValuesEditionAdviceConfiguration createRuntimeValuesEditionAdviceConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>View To Display</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>View To Display</em>'.
-	 * @generated
-	 */
-	ViewToDisplay createViewToDisplay();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RuntimevalueseditionadviceconfigurationPackage getRuntimevalueseditionadviceconfigurationPackage();
-
-} //RuntimevalueseditionadviceconfigurationFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationPackage.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationPackage.java
deleted file mode 100644
index 9d63760591d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/RuntimevalueseditionadviceconfigurationPackage.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface RuntimevalueseditionadviceconfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "runtimevalueseditionadviceconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/runtimevalueseditionadviceconfiguration/1.1";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "runtimevalueseditionadviceconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RuntimevalueseditionadviceconfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl <em>Runtime Values Edition Advice Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getRuntimeValuesEditionAdviceConfiguration()
-	 * @generated
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Before</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__BEFORE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
-
-	/**
-	 * The feature id for the '<em><b>After</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__AFTER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__TARGET = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Inheritance</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__INHERITANCE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
-
-	/**
-	 * The feature id for the '<em><b>Views To Display</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Runtime Values Edition Advice Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getViewToDisplay()
-	 * @generated
-	 */
-	int VIEW_TO_DISPLAY = 1;
-
-	/**
-	 * The feature id for the '<em><b>View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TO_DISPLAY__VIEW = 0;
-
-	/**
-	 * The number of structural features of the '<em>View To Display</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VIEW_TO_DISPLAY_FEATURE_COUNT = 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration <em>Runtime Values Edition Advice Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Runtime Values Edition Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration
-	 * @generated
-	 */
-	EClass getRuntimeValuesEditionAdviceConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration#getViewsToDisplay <em>Views To Display</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Views To Display</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration#getViewsToDisplay()
-	 * @see #getRuntimeValuesEditionAdviceConfiguration()
-	 * @generated
-	 */
-	EReference getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay <em>View To Display</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>View To Display</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay
-	 * @generated
-	 */
-	EClass getViewToDisplay();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay#getView <em>View</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>View</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay#getView()
-	 * @see #getViewToDisplay()
-	 * @generated
-	 */
-	EReference getViewToDisplay_View();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	RuntimevalueseditionadviceconfigurationFactory getRuntimevalueseditionadviceconfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl <em>Runtime Values Edition Advice Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimeValuesEditionAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getRuntimeValuesEditionAdviceConfiguration()
-		 * @generated
-		 */
-		EClass RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION = eINSTANCE.getRuntimeValuesEditionAdviceConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Views To Display</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY = eINSTANCE.getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl <em>View To Display</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.ViewToDisplayImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl.RuntimevalueseditionadviceconfigurationPackageImpl#getViewToDisplay()
-		 * @generated
-		 */
-		EClass VIEW_TO_DISPLAY = eINSTANCE.getViewToDisplay();
-
-		/**
-		 * The meta object literal for the '<em><b>View</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference VIEW_TO_DISPLAY__VIEW = eINSTANCE.getViewToDisplay_View();
-
-	}
-
-} //RuntimevalueseditionadviceconfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/ViewToDisplay.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/ViewToDisplay.java
deleted file mode 100644
index 6c4bba6e5df..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/ViewToDisplay.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.properties.contexts.View;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>View To Display</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay#getView <em>View</em>}</li>
- * </ul>
- *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getViewToDisplay()
- * @model
- * @generated
- */
-public interface ViewToDisplay extends EObject {
-	/**
-	 * Returns the value of the '<em><b>View</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>View</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>View</em>' reference.
-	 * @see #setView(View)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#getViewToDisplay_View()
-	 * @model required="true"
-	 * @generated
-	 */
-	View getView();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay#getView <em>View</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>View</em>' reference.
-	 * @see #getView()
-	 * @generated
-	 */
-	void setView(View value);
-
-} // ViewToDisplay
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationFactoryImpl.java
deleted file mode 100644
index 0837d7cfeca..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationFactoryImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RuntimevalueseditionadviceconfigurationFactoryImpl extends EFactoryImpl implements RuntimevalueseditionadviceconfigurationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static RuntimevalueseditionadviceconfigurationFactory init() {
-		try {
-			RuntimevalueseditionadviceconfigurationFactory theRuntimevalueseditionadviceconfigurationFactory = (RuntimevalueseditionadviceconfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(RuntimevalueseditionadviceconfigurationPackage.eNS_URI);
-			if (theRuntimevalueseditionadviceconfigurationFactory != null) {
-				return theRuntimevalueseditionadviceconfigurationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new RuntimevalueseditionadviceconfigurationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuntimevalueseditionadviceconfigurationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case RuntimevalueseditionadviceconfigurationPackage.RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION: return createRuntimeValuesEditionAdviceConfiguration();
-			case RuntimevalueseditionadviceconfigurationPackage.VIEW_TO_DISPLAY: return createViewToDisplay();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuntimeValuesEditionAdviceConfiguration createRuntimeValuesEditionAdviceConfiguration() {
-		RuntimeValuesEditionAdviceConfigurationImpl runtimeValuesEditionAdviceConfiguration = new RuntimeValuesEditionAdviceConfigurationImpl();
-		return runtimeValuesEditionAdviceConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ViewToDisplay createViewToDisplay() {
-		ViewToDisplayImpl viewToDisplay = new ViewToDisplayImpl();
-		return viewToDisplay;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuntimevalueseditionadviceconfigurationPackage getRuntimevalueseditionadviceconfigurationPackage() {
-		return (RuntimevalueseditionadviceconfigurationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static RuntimevalueseditionadviceconfigurationPackage getPackage() {
-		return RuntimevalueseditionadviceconfigurationPackage.eINSTANCE;
-	}
-
-} //RuntimevalueseditionadviceconfigurationFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationPackageImpl.java
deleted file mode 100644
index 0deec6586bd..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/impl/RuntimevalueseditionadviceconfigurationPackageImpl.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.ViewToDisplay;
-
-import org.eclipse.papyrus.infra.properties.contexts.ContextsPackage;
-
-import org.eclipse.papyrus.infra.properties.environment.EnvironmentPackage;
-
-import org.eclipse.papyrus.infra.properties.ui.UiPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RuntimevalueseditionadviceconfigurationPackageImpl extends EPackageImpl implements RuntimevalueseditionadviceconfigurationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass runtimeValuesEditionAdviceConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass viewToDisplayEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimevalueseditionadviceconfigurationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RuntimevalueseditionadviceconfigurationPackageImpl() {
-		super(eNS_URI, RuntimevalueseditionadviceconfigurationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link RuntimevalueseditionadviceconfigurationPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static RuntimevalueseditionadviceconfigurationPackage init() {
-		if (isInited) return (RuntimevalueseditionadviceconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(RuntimevalueseditionadviceconfigurationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		RuntimevalueseditionadviceconfigurationPackageImpl theRuntimevalueseditionadviceconfigurationPackage = (RuntimevalueseditionadviceconfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuntimevalueseditionadviceconfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RuntimevalueseditionadviceconfigurationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		ElementtypesconfigurationsPackage.eINSTANCE.eClass();
-		EnvironmentPackage.eINSTANCE.eClass();
-		ContextsPackage.eINSTANCE.eClass();
-		UiPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theRuntimevalueseditionadviceconfigurationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRuntimevalueseditionadviceconfigurationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRuntimevalueseditionadviceconfigurationPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(RuntimevalueseditionadviceconfigurationPackage.eNS_URI, theRuntimevalueseditionadviceconfigurationPackage);
-		return theRuntimevalueseditionadviceconfigurationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRuntimeValuesEditionAdviceConfiguration() {
-		return runtimeValuesEditionAdviceConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay() {
-		return (EReference)runtimeValuesEditionAdviceConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getViewToDisplay() {
-		return viewToDisplayEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getViewToDisplay_View() {
-		return (EReference)viewToDisplayEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuntimevalueseditionadviceconfigurationFactory getRuntimevalueseditionadviceconfigurationFactory() {
-		return (RuntimevalueseditionadviceconfigurationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		runtimeValuesEditionAdviceConfigurationEClass = createEClass(RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION);
-		createEReference(runtimeValuesEditionAdviceConfigurationEClass, RUNTIME_VALUES_EDITION_ADVICE_CONFIGURATION__VIEWS_TO_DISPLAY);
-
-		viewToDisplayEClass = createEClass(VIEW_TO_DISPLAY);
-		createEReference(viewToDisplayEClass, VIEW_TO_DISPLAY__VIEW);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ElementtypesconfigurationsPackage theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);
-		ContextsPackage theContextsPackage = (ContextsPackage)EPackage.Registry.INSTANCE.getEPackage(ContextsPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		runtimeValuesEditionAdviceConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAbstractAdviceBindingConfiguration());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(runtimeValuesEditionAdviceConfigurationEClass, RuntimeValuesEditionAdviceConfiguration.class, "RuntimeValuesEditionAdviceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRuntimeValuesEditionAdviceConfiguration_ViewsToDisplay(), this.getViewToDisplay(), null, "viewsToDisplay", null, 0, -1, RuntimeValuesEditionAdviceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(viewToDisplayEClass, ViewToDisplay.class, "ViewToDisplay", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getViewToDisplay_View(), theContextsPackage.getView(), null, "view", null, 1, 1, ViewToDisplay.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //RuntimevalueseditionadviceconfigurationPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceFactoryImpl.java
deleted file mode 100644
index 2cd4ed7da1f..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationResourceImpl
- * @generated
- */
-public class RuntimevalueseditionadviceconfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuntimevalueseditionadviceconfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new RuntimevalueseditionadviceconfigurationResourceImpl(uri);
-		return result;
-	}
-
-} //RuntimevalueseditionadviceconfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceImpl.java
deleted file mode 100644
index 2ca0ce417ca..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/runtimevalueseditionadviceconfiguration/util/RuntimevalueseditionadviceconfigurationResourceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.util.RuntimevalueseditionadviceconfigurationResourceFactoryImpl
- * @generated
- */
-public class RuntimevalueseditionadviceconfigurationResourceImpl extends XMIResourceImpl {
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
-	public RuntimevalueseditionadviceconfigurationResourceImpl(URI uri) {
-		super(uri);
-	}
-
-} //RuntimevalueseditionadviceconfigurationResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
deleted file mode 100644
index d995c26af94..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/ui/setvaluesadviceconfiguration/provider/RuntimeValuesEditionAdviceConfigurationEditPlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.setvaluesadviceconfiguration.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-import org.eclipse.papyrus.infra.constraints.provider.ConstraintsEditPlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
-
-import org.eclipse.papyrus.infra.properties.environment.provider.PropertiesEditPlugin;
-
-/**
- * This is the central singleton for the RuntimeValuesEditionAdviceConfiguration edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class RuntimeValuesEditionAdviceConfigurationEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final RuntimeValuesEditionAdviceConfigurationEditPlugin INSTANCE = new RuntimeValuesEditionAdviceConfigurationEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuntimeValuesEditionAdviceConfigurationEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		     ConstraintsEditPlugin.INSTANCE,
-		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
-		     PropertiesEditPlugin.INSTANCE,
-		   });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java
deleted file mode 100644
index a60597a4c43..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/internal/ui/advice/RuntimeValuesEditionAdviceEditHelperAdviceFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.internal.ui.advice;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui.runtimevalueseditionadviceconfiguration.RuntimeValuesEditionAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
-
-public class RuntimeValuesEditionAdviceEditHelperAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {
-
-	@Override
-	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {
-		if (adviceConfiguration instanceof RuntimeValuesEditionAdviceConfiguration) {
-			IEditHelperAdvice editHelperAdvice = new RuntimeValuesEditionAdviceEditHelperAdvice((RuntimeValuesEditionAdviceConfiguration) adviceConfiguration);
-			return editHelperAdvice;
-		}
-		return NullEditHelperAdvice.getInstance();
-	}
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.project b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.project
deleted file mode 100644
index 9f651690d75..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.emf</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
deleted file mode 100644
index 6aa337dd49d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.papyrus.infra.properties;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.emf,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.impl,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.emf;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel
deleted file mode 100644
index 9e0e9c412c0..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/InvariantContainerRuleConfiguration.genmodel
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-	xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-	xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-	copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-	modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
-	editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"
-	editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen"
-	modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
-	modelName="InvariantContainerRuleConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-	importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0"
-	copyrightFields="false"
-	editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
-	editorPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.editor"
-	usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel#//invarianttypeconfiguration"
-	operationReflection="true" importOrganizing="true">
-	<foreignModel>InvariantContainerRuleConfiguration.ecore</foreignModel>
-	<genPackages prefix="InvariantContainerRuleConfiguration"
-		basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"
-		resource="XMI" disposableProviderFactory="true"
-		childCreationExtenders="true" ecorePackage="InvariantContainerRuleConfiguration.ecore#/">
-		<genClasses
-			ecoreClass="InvariantContainerRuleConfiguration.ecore#//InvariantContainerRuleConfiguration">
-			<genFeatures property="None" children="true" createChild="true"
-				ecoreFeature="ecore:EReference InvariantContainerRuleConfiguration.ecore#//InvariantContainerRuleConfiguration/permissions" />
-		</genClasses>
-		<genClasses
-			ecoreClass="InvariantContainerRuleConfiguration.ecore#//HierarchyPermission">
-			<genFeatures createChild="false"
-				ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/childType" />
-			<genFeatures createChild="false"
-				ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/isPermitted" />
-			<genFeatures createChild="false"
-				ecoreFeature="ecore:EAttribute InvariantContainerRuleConfiguration.ecore#//HierarchyPermission/isStrict" />
-		</genClasses>
-	</genPackages>
-</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.genmodel
deleted file mode 100644
index 1a9991a89d8..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/model/SetValuesAdviceConfiguration.genmodel
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"

-    editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen"

-    editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.emf" modelName="SetValuesAdviceConfiguration"

-    editPluginClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationEditPlugin"

-    testsDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.tests/src-gen"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">

-  <foreignModel>SetValuesAdviceConfiguration.ecore</foreignModel>

-  <genPackages prefix="SetValuesAdviceConfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations.emf"

-      resource="XMI" disposableProviderFactory="true" childCreationExtenders="true"

-      ecorePackage="SetValuesAdviceConfiguration.ecore#/">

-    <genClasses ecoreClass="SetValuesAdviceConfiguration.ecore#//SetValuesAdviceConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdviceConfiguration.ecore#//SetValuesAdviceConfiguration/featuresToSet"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesAdviceConfiguration.ecore#//FeatureToSet">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetValuesAdviceConfiguration.ecore#//FeatureToSet/featureName"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdviceConfiguration.ecore#//FeatureToSet/value"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="SetValuesAdviceConfiguration.ecore#//FeatureValue"/>

-    <genClasses ecoreClass="SetValuesAdviceConfiguration.ecore#//DynamicValue"/>

-    <genClasses ecoreClass="SetValuesAdviceConfiguration.ecore#//ConstantValue">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdviceConfiguration.ecore#//ConstantValue/valueInstance"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesAdviceConfiguration.ecore#//ListValue">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SetValuesAdviceConfiguration.ecore#//ListValue/values"/>

-    </genClasses>

-    <genClasses ecoreClass="SetValuesAdviceConfiguration.ecore#//QueryExecutionValue"/>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
deleted file mode 100644
index f0109c24dfc..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/plugin.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-
-
-
-
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated SetValuesAdviceConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage"
-            genModel="model/SetValuesAdviceConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated SetValuesAdviceConfiguration -->
-      <parser
-            type="setvaluesadviceconfiguration"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated SetValuesAdviceConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated SetValuesAdviceConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider.SetValuesAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated InvariantContainerRuleConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfigurationPackage"
-            genModel="model/InvariantContainerRuleConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated InvariantContainerRuleConfiguration -->
-      <parser
-            type="invariantcontainerruleconfiguration"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util.InvariantContainerRuleConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated InvariantContainerRuleConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/containerruleconfiguration/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated InvariantContainerRuleConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.0"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider.InvariantContainerRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>
-   </extension>
-
-
-
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">
-      <adviceConfigurationType
-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfiguration"
-            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceEditHelperAdviceFactory">
-      </adviceConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invariantRule">
-      <invariantRule
-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.InvariantContainerRuleConfiguration"
-            invariantRuleClass="org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerconfiguration.InvariantContainerRule">
-      </invariantRule>
-   </extension>
-</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationEditPlugin.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationEditPlugin.java
deleted file mode 100644
index b7737278e0a..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/provider/InvariantContainerRuleConfigurationEditPlugin.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationEditPlugin;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
-
-/**
- * This is the central singleton for the InvariantContainerRuleConfiguration edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class InvariantContainerRuleConfigurationEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final InvariantContainerRuleConfigurationEditPlugin INSTANCE = new InvariantContainerRuleConfigurationEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InvariantContainerRuleConfigurationEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
-		     InvariantTypeConfigurationEditPlugin.INSTANCE,
-		   });
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 957772b5d3c..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util.InvariantContainerRuleConfigurationResourceImpl
- * @generated
- */
-public class InvariantContainerRuleConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InvariantContainerRuleConfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new InvariantContainerRuleConfigurationResourceImpl(uri);
-		return result;
-	}
-
-} //InvariantContainerRuleConfigurationResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.project b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.project
deleted file mode 100644
index 3f5b1548373..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/META-INF/MANIFEST.MF
deleted file mode 100644
index a3a1a27be20..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

- org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="2.6.0";visibility:=reexport,

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.edit;visibility:=reexport,

- org.eclipse.emf.ecore.edit;visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;bundle-version="1.2.0";visibility:=reexport

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration,

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl,

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider,

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util,

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes,

- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationEditPlugin$Implementation

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
deleted file mode 100644
index 9ea45aa16a5..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="invarianttypeconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
-    nsPrefix="invarianttypeconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="invariantRuleConfiguration"
-        lowerBound="1" eType="#//InvariantRuleConfiguration" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantRuleConfiguration" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositeInvariantRuleConfiguration"
-      abstract="true" eSuperTypes="#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"
-        upperBound="-1" eType="#//InvariantRuleConfiguration" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NotInvariantRuleConfiguration" eSuperTypes="#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"
-        eType="#//InvariantRuleConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AndInvariantRuleConfiguration" eSuperTypes="#//CompositeInvariantRuleConfiguration"/>
-  <eClassifiers xsi:type="ecore:EClass" name="OrInvariantRuleConfiguration" eSuperTypes="#//CompositeInvariantRuleConfiguration"/>
-</ecore:EPackage>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel
deleted file mode 100644
index 993392db2e0..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

-    modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen"

-    creationSubmenus="true" editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen"

-    editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen"

-    modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes"

-    modelName="InvariantTypeConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    testsDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src-gen"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

-    editPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes"

-    editorPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations.editor" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>InvariantTypeConfiguration.ecore</foreignModel>

-  <genPackages prefix="InvariantTypeConfiguration" basePackage="org.eclipse.papyrus.infra.elementtypesconfigurations"

-      resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true"

-      childCreationExtenders="true" ecorePackage="InvariantTypeConfiguration.ecore#/">

-    <genClasses ecoreClass="InvariantTypeConfiguration.ecore#//InvariantTypeConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantTypeConfiguration.ecore#//InvariantTypeConfiguration/invariantRuleConfiguration"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="InvariantTypeConfiguration.ecore#//InvariantRuleConfiguration"/>

-    <genClasses image="false" ecoreClass="InvariantTypeConfiguration.ecore#//CompositeInvariantRuleConfiguration">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference InvariantTypeConfiguration.ecore#//CompositeInvariantRuleConfiguration/composedRules"/>

-    </genClasses>

-    <genClasses ecoreClass="InvariantTypeConfiguration.ecore#//NotInvariantRuleConfiguration">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference InvariantTypeConfiguration.ecore#//NotInvariantRuleConfiguration/composedRule"/>

-    </genClasses>

-    <genClasses ecoreClass="InvariantTypeConfiguration.ecore#//AndInvariantRuleConfiguration"/>

-    <genClasses ecoreClass="InvariantTypeConfiguration.ecore#//OrInvariantRuleConfiguration"/>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
deleted file mode 100644
index 4c77694c3bc..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/invarianttype.elementtypesconfigurations
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/invarianttype" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="InvariantTypes" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.DefaultInvariantEditHelperAdvice" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.DefaultInvariantEditHelperAdvice" inheritance="all" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
deleted file mode 100644
index b535ce1fc47..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension-point id="invariantRule" name="Invariant Rule Extension Point" schema="schema/invariantRule.exsd"/>
-
-
-
-
-
-
-
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated InvariantTypeConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage"
-            genModel="model/InvariantTypeConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated InvariantTypeConfiguration -->
-      <parser
-            type="invarianttypeconfiguration"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated InvariantTypeConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated InvariantTypeConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeConfigurationType">
-      <elementTypeConfigurationType
-            configurationClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration"
-            factoryClass="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.InvariantElementTypeFactory">
-      </elementTypeConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
-      <elementTypeSet
-            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
-            path="model/invarianttype.elementtypesconfigurations">
-      </elementTypeSet>
-   </extension>
-</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml
deleted file mode 100644
index 61cae9899c1..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/AndInvariantRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/AndInvariantRuleConfiguration.java
deleted file mode 100644
index 403621e05e6..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/AndInvariantRuleConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>And Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getAndInvariantRuleConfiguration()

- * @model

- * @generated

- */

-public interface AndInvariantRuleConfiguration extends CompositeInvariantRuleConfiguration {

-} // AndInvariantRuleConfiguration

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantRuleConfiguration.java
deleted file mode 100644
index 126c80ef971..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantRuleConfiguration.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getInvariantRuleConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface InvariantRuleConfiguration extends EObject {

-} // InvariantRuleConfiguration

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java
deleted file mode 100644
index 9abb9cac3dd..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfiguration.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Invariant Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getInvariantTypeConfiguration()

- * @model

- * @generated

- */

-public interface InvariantTypeConfiguration extends SpecializationTypeConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Invariant Rule Configuration</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Invariant Rule Configuration</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Invariant Rule Configuration</em>' containment reference.

-	 * @see #setInvariantRuleConfiguration(InvariantRuleConfiguration)

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getInvariantTypeConfiguration_InvariantRuleConfiguration()

-	 * @model containment="true" required="true"

-	 * @generated

-	 */

-	InvariantRuleConfiguration getInvariantRuleConfiguration();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Invariant Rule Configuration</em>' containment reference.

-	 * @see #getInvariantRuleConfiguration()

-	 * @generated

-	 */

-	void setInvariantRuleConfiguration(InvariantRuleConfiguration value);

-

-} // InvariantTypeConfiguration

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java
deleted file mode 100644
index c0d45beff39..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage

- * @generated

- */

-public interface InvariantTypeConfigurationFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	InvariantTypeConfigurationFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Invariant Type Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Invariant Type Configuration</em>'.

-	 * @generated

-	 */

-	InvariantTypeConfiguration createInvariantTypeConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Not Invariant Rule Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Not Invariant Rule Configuration</em>'.

-	 * @generated

-	 */

-	NotInvariantRuleConfiguration createNotInvariantRuleConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>And Invariant Rule Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>And Invariant Rule Configuration</em>'.

-	 * @generated

-	 */

-	AndInvariantRuleConfiguration createAndInvariantRuleConfiguration();

-

-	/**

-	 * Returns a new object of class '<em>Or Invariant Rule Configuration</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Or Invariant Rule Configuration</em>'.

-	 * @generated

-	 */

-	OrInvariantRuleConfiguration createOrInvariantRuleConfiguration();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	InvariantTypeConfigurationPackage getInvariantTypeConfigurationPackage();

-

-} //InvariantTypeConfigurationFactory

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java
deleted file mode 100644
index 25e1c9d4409..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/InvariantTypeConfigurationPackage.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory
- * @model kind="package"
- * @generated
- */
-public interface InvariantTypeConfigurationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "invarianttypeconfiguration";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "invarianttypeconfiguration";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	InvariantTypeConfigurationPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl <em>Invariant Type Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantTypeConfiguration()
-	 * @generated
-	 */
-	int INVARIANT_TYPE_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__IDENTIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__NAME = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Hint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__HINT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__HINT;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__KIND = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__KIND;
-
-	/**
-	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__ICON_ENTRY = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
-
-	/**
-	 * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
-
-	/**
-	 * The feature id for the '<em><b>Invariant Rule Configuration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Invariant Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Invariant Type Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_TYPE_CONFIGURATION_OPERATION_COUNT = ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
-	 * @generated
-	 */
-	int INVARIANT_RULE_CONFIGURATION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = 0;
-
-	/**
-	 * The number of operations of the '<em>Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl <em>Composite Invariant Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getCompositeInvariantRuleConfiguration()
-	 * @generated
-	 */
-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Composite Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Composite Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl <em>Not Invariant Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getNotInvariantRuleConfiguration()
-	 * @generated
-	 */
-	int NOT_INVARIANT_RULE_CONFIGURATION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rule</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Not Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOT_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of operations of the '<em>Not Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOT_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl <em>And Invariant Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getAndInvariantRuleConfiguration()
-	 * @generated
-	 */
-	int AND_INVARIANT_RULE_CONFIGURATION = 4;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES;
-
-	/**
-	 * The number of structural features of the '<em>And Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>And Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AND_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl <em>Or Invariant Rule Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getOrInvariantRuleConfiguration()
-	 * @generated
-	 */
-	int OR_INVARIANT_RULE_CONFIGURATION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES;
-
-	/**
-	 * The number of structural features of the '<em>Or Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of operations of the '<em>Or Invariant Rule Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OR_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration <em>Invariant Type Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Invariant Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration
-	 * @generated
-	 */
-	EClass getInvariantTypeConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration#getInvariantRuleConfiguration()
-	 * @see #getInvariantTypeConfiguration()
-	 * @generated
-	 */
-	EReference getInvariantTypeConfiguration_InvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration
-	 * @generated
-	 */
-	EClass getInvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration <em>Composite Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Composite Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration
-	 * @generated
-	 */
-	EClass getCompositeInvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Composed Rules</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules()
-	 * @see #getCompositeInvariantRuleConfiguration()
-	 * @generated
-	 */
-	EReference getCompositeInvariantRuleConfiguration_ComposedRules();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration <em>Not Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Not Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration
-	 * @generated
-	 */
-	EClass getNotInvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule <em>Composed Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Composed Rule</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule()
-	 * @see #getNotInvariantRuleConfiguration()
-	 * @generated
-	 */
-	EReference getNotInvariantRuleConfiguration_ComposedRule();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration <em>And Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>And Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration
-	 * @generated
-	 */
-	EClass getAndInvariantRuleConfiguration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration <em>Or Invariant Rule Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Or Invariant Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration
-	 * @generated
-	 */
-	EClass getOrInvariantRuleConfiguration();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	InvariantTypeConfigurationFactory getInvariantTypeConfigurationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl <em>Invariant Type Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantTypeConfiguration()
-		 * @generated
-		 */
-		EClass INVARIANT_TYPE_CONFIGURATION = eINSTANCE.getInvariantTypeConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Invariant Rule Configuration</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantTypeConfiguration_InvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl <em>Invariant Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getInvariantRuleConfiguration()
-		 * @generated
-		 */
-		EClass INVARIANT_RULE_CONFIGURATION = eINSTANCE.getInvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl <em>Composite Invariant Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getCompositeInvariantRuleConfiguration()
-		 * @generated
-		 */
-		EClass COMPOSITE_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getCompositeInvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Composed Rules</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getCompositeInvariantRuleConfiguration_ComposedRules();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl <em>Not Invariant Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getNotInvariantRuleConfiguration()
-		 * @generated
-		 */
-		EClass NOT_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getNotInvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Composed Rule</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE = eINSTANCE.getNotInvariantRuleConfiguration_ComposedRule();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl <em>And Invariant Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.AndInvariantRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getAndInvariantRuleConfiguration()
-		 * @generated
-		 */
-		EClass AND_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getAndInvariantRuleConfiguration();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl <em>Or Invariant Rule Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.OrInvariantRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationPackageImpl#getOrInvariantRuleConfiguration()
-		 * @generated
-		 */
-		EClass OR_INVARIANT_RULE_CONFIGURATION = eINSTANCE.getOrInvariantRuleConfiguration();
-
-	}
-
-} //InvariantTypeConfigurationPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java
deleted file mode 100644
index 9edf5db1eb9..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/NotInvariantRuleConfiguration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Not Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule <em>Composed Rule</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getNotInvariantRuleConfiguration()

- * @model

- * @generated

- */

-public interface NotInvariantRuleConfiguration extends InvariantRuleConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Composed Rule</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Composed Rule</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Composed Rule</em>' reference.

-	 * @see #setComposedRule(InvariantRuleConfiguration)

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getNotInvariantRuleConfiguration_ComposedRule()

-	 * @model required="true"

-	 * @generated

-	 */

-	InvariantRuleConfiguration getComposedRule();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration#getComposedRule <em>Composed Rule</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Composed Rule</em>' reference.

-	 * @see #getComposedRule()

-	 * @generated

-	 */

-	void setComposedRule(InvariantRuleConfiguration value);

-

-} // NotInvariantRuleConfiguration

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/OrInvariantRuleConfiguration.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/OrInvariantRuleConfiguration.java
deleted file mode 100644
index 762e7fde3e6..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/OrInvariantRuleConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Or Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getOrInvariantRuleConfiguration()

- * @model

- * @generated

- */

-public interface OrInvariantRuleConfiguration extends CompositeInvariantRuleConfiguration {

-} // OrInvariantRuleConfiguration

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java
deleted file mode 100644
index 81c1b369b05..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/AndInvariantRuleConfigurationImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>And Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class AndInvariantRuleConfigurationImpl extends CompositeInvariantRuleConfigurationImpl implements AndInvariantRuleConfiguration {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AndInvariantRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantTypeConfigurationPackage.Literals.AND_INVARIANT_RULE_CONFIGURATION;

-	}

-

-} //AndInvariantRuleConfigurationImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java
deleted file mode 100644
index 1ccad7a276e..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantRuleConfigurationImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public abstract class InvariantRuleConfigurationImpl extends MinimalEObjectImpl.Container implements InvariantRuleConfiguration {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected InvariantRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantTypeConfigurationPackage.Literals.INVARIANT_RULE_CONFIGURATION;

-	}

-

-} //InvariantRuleConfigurationImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java
deleted file mode 100644
index 1db3ddcc49b..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class InvariantTypeConfigurationFactoryImpl extends EFactoryImpl implements InvariantTypeConfigurationFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static InvariantTypeConfigurationFactory init() {

-		try {

-			InvariantTypeConfigurationFactory theInvariantTypeConfigurationFactory = (InvariantTypeConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(InvariantTypeConfigurationPackage.eNS_URI);

-			if (theInvariantTypeConfigurationFactory != null) {

-				return theInvariantTypeConfigurationFactory;

-			}

-		}

-		catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new InvariantTypeConfigurationFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION: return createInvariantTypeConfiguration();

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION: return createNotInvariantRuleConfiguration();

-			case InvariantTypeConfigurationPackage.AND_INVARIANT_RULE_CONFIGURATION: return createAndInvariantRuleConfiguration();

-			case InvariantTypeConfigurationPackage.OR_INVARIANT_RULE_CONFIGURATION: return createOrInvariantRuleConfiguration();

-			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfiguration createInvariantTypeConfiguration() {

-		InvariantTypeConfigurationImpl invariantTypeConfiguration = new InvariantTypeConfigurationImpl();

-		return invariantTypeConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotInvariantRuleConfiguration createNotInvariantRuleConfiguration() {

-		NotInvariantRuleConfigurationImpl notInvariantRuleConfiguration = new NotInvariantRuleConfigurationImpl();

-		return notInvariantRuleConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AndInvariantRuleConfiguration createAndInvariantRuleConfiguration() {

-		AndInvariantRuleConfigurationImpl andInvariantRuleConfiguration = new AndInvariantRuleConfigurationImpl();

-		return andInvariantRuleConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OrInvariantRuleConfiguration createOrInvariantRuleConfiguration() {

-		OrInvariantRuleConfigurationImpl orInvariantRuleConfiguration = new OrInvariantRuleConfigurationImpl();

-		return orInvariantRuleConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationPackage getInvariantTypeConfigurationPackage() {

-		return (InvariantTypeConfigurationPackage)getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static InvariantTypeConfigurationPackage getPackage() {

-		return InvariantTypeConfigurationPackage.eINSTANCE;

-	}

-

-} //InvariantTypeConfigurationFactoryImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java
deleted file mode 100644
index e2c84e0537d..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Invariant Type Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantTypeConfigurationImpl#getInvariantRuleConfiguration <em>Invariant Rule Configuration</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class InvariantTypeConfigurationImpl extends SpecializationTypeConfigurationImpl implements InvariantTypeConfiguration {

-	/**

-	 * The cached value of the '{@link #getInvariantRuleConfiguration() <em>Invariant Rule Configuration</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getInvariantRuleConfiguration()

-	 * @generated

-	 * @ordered

-	 */

-	protected InvariantRuleConfiguration invariantRuleConfiguration;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected InvariantTypeConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantRuleConfiguration getInvariantRuleConfiguration() {

-		return invariantRuleConfiguration;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotificationChain basicSetInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration, NotificationChain msgs) {

-		InvariantRuleConfiguration oldInvariantRuleConfiguration = invariantRuleConfiguration;

-		invariantRuleConfiguration = newInvariantRuleConfiguration;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, oldInvariantRuleConfiguration, newInvariantRuleConfiguration);

-			if (msgs == null) msgs = notification; else msgs.add(notification);

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setInvariantRuleConfiguration(InvariantRuleConfiguration newInvariantRuleConfiguration) {

-		if (newInvariantRuleConfiguration != invariantRuleConfiguration) {

-			NotificationChain msgs = null;

-			if (invariantRuleConfiguration != null)

-				msgs = ((InternalEObject)invariantRuleConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);

-			if (newInvariantRuleConfiguration != null)

-				msgs = ((InternalEObject)newInvariantRuleConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, null, msgs);

-			msgs = basicSetInvariantRuleConfiguration(newInvariantRuleConfiguration, msgs);

-			if (msgs != null) msgs.dispatch();

-		}

-		else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION, newInvariantRuleConfiguration, newInvariantRuleConfiguration));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-				return basicSetInvariantRuleConfiguration(null, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-				return getInvariantRuleConfiguration();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-				setInvariantRuleConfiguration((InvariantRuleConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-				setInvariantRuleConfiguration((InvariantRuleConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-				return invariantRuleConfiguration != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} //InvariantTypeConfigurationImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java
deleted file mode 100644
index e9217295cd4..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/InvariantTypeConfigurationPackageImpl.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * @generated

- */

-public class InvariantTypeConfigurationPackageImpl extends EPackageImpl implements InvariantTypeConfigurationPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass invariantTypeConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass invariantRuleConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass compositeInvariantRuleConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass notInvariantRuleConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass andInvariantRuleConfigurationEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass orInvariantRuleConfigurationEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private InvariantTypeConfigurationPackageImpl() {

-		super(eNS_URI, InvariantTypeConfigurationFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link InvariantTypeConfigurationPackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static InvariantTypeConfigurationPackage init() {

-		if (isInited) return (InvariantTypeConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(InvariantTypeConfigurationPackage.eNS_URI);

-

-		// Obtain or create and register package

-		InvariantTypeConfigurationPackageImpl theInvariantTypeConfigurationPackage = (InvariantTypeConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InvariantTypeConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InvariantTypeConfigurationPackageImpl());

-

-		isInited = true;

-

-		// Initialize simple dependencies

-		EcorePackage.eINSTANCE.eClass();

-		ElementtypesconfigurationsPackage.eINSTANCE.eClass();

-

-		// Create package meta-data objects

-		theInvariantTypeConfigurationPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theInvariantTypeConfigurationPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theInvariantTypeConfigurationPackage.freeze();

-

-  

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(InvariantTypeConfigurationPackage.eNS_URI, theInvariantTypeConfigurationPackage);

-		return theInvariantTypeConfigurationPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getInvariantTypeConfiguration() {

-		return invariantTypeConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getInvariantTypeConfiguration_InvariantRuleConfiguration() {

-		return (EReference)invariantTypeConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getInvariantRuleConfiguration() {

-		return invariantRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getCompositeInvariantRuleConfiguration() {

-		return compositeInvariantRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getCompositeInvariantRuleConfiguration_ComposedRules() {

-		return (EReference)compositeInvariantRuleConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getNotInvariantRuleConfiguration() {

-		return notInvariantRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getNotInvariantRuleConfiguration_ComposedRule() {

-		return (EReference)notInvariantRuleConfigurationEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getAndInvariantRuleConfiguration() {

-		return andInvariantRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getOrInvariantRuleConfiguration() {

-		return orInvariantRuleConfigurationEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationFactory getInvariantTypeConfigurationFactory() {

-		return (InvariantTypeConfigurationFactory)getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated) return;

-		isCreated = true;

-

-		// Create classes and their features

-		invariantTypeConfigurationEClass = createEClass(INVARIANT_TYPE_CONFIGURATION);

-		createEReference(invariantTypeConfigurationEClass, INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);

-

-		invariantRuleConfigurationEClass = createEClass(INVARIANT_RULE_CONFIGURATION);

-

-		compositeInvariantRuleConfigurationEClass = createEClass(COMPOSITE_INVARIANT_RULE_CONFIGURATION);

-		createEReference(compositeInvariantRuleConfigurationEClass, COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES);

-

-		notInvariantRuleConfigurationEClass = createEClass(NOT_INVARIANT_RULE_CONFIGURATION);

-		createEReference(notInvariantRuleConfigurationEClass, NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE);

-

-		andInvariantRuleConfigurationEClass = createEClass(AND_INVARIANT_RULE_CONFIGURATION);

-

-		orInvariantRuleConfigurationEClass = createEClass(OR_INVARIANT_RULE_CONFIGURATION);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized) return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Obtain other dependent packages

-		ElementtypesconfigurationsPackage theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		invariantTypeConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getSpecializationTypeConfiguration());

-		compositeInvariantRuleConfigurationEClass.getESuperTypes().add(this.getInvariantRuleConfiguration());

-		notInvariantRuleConfigurationEClass.getESuperTypes().add(this.getInvariantRuleConfiguration());

-		andInvariantRuleConfigurationEClass.getESuperTypes().add(this.getCompositeInvariantRuleConfiguration());

-		orInvariantRuleConfigurationEClass.getESuperTypes().add(this.getCompositeInvariantRuleConfiguration());

-

-		// Initialize classes, features, and operations; add parameters

-		initEClass(invariantTypeConfigurationEClass, InvariantTypeConfiguration.class, "InvariantTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getInvariantTypeConfiguration_InvariantRuleConfiguration(), this.getInvariantRuleConfiguration(), null, "invariantRuleConfiguration", null, 1, 1, InvariantTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(invariantRuleConfigurationEClass, InvariantRuleConfiguration.class, "InvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(compositeInvariantRuleConfigurationEClass, CompositeInvariantRuleConfiguration.class, "CompositeInvariantRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getCompositeInvariantRuleConfiguration_ComposedRules(), this.getInvariantRuleConfiguration(), null, "composedRules", null, 2, -1, CompositeInvariantRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(notInvariantRuleConfigurationEClass, NotInvariantRuleConfiguration.class, "NotInvariantRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getNotInvariantRuleConfiguration_ComposedRule(), this.getInvariantRuleConfiguration(), null, "composedRule", null, 1, 1, NotInvariantRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(andInvariantRuleConfigurationEClass, AndInvariantRuleConfiguration.class, "AndInvariantRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		initEClass(orInvariantRuleConfigurationEClass, OrInvariantRuleConfiguration.class, "OrInvariantRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} //InvariantTypeConfigurationPackageImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java
deleted file mode 100644
index 0db6f33e674..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/OrInvariantRuleConfigurationImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.ecore.EClass;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Or Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class OrInvariantRuleConfigurationImpl extends CompositeInvariantRuleConfigurationImpl implements OrInvariantRuleConfiguration {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected OrInvariantRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantTypeConfigurationPackage.Literals.OR_INVARIANT_RULE_CONFIGURATION;

-	}

-

-} //OrInvariantRuleConfigurationImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/AndInvariantRuleConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/AndInvariantRuleConfigurationItemProvider.java
deleted file mode 100644
index 3f34476d1e4..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/AndInvariantRuleConfigurationItemProvider.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class AndInvariantRuleConfigurationItemProvider extends CompositeInvariantRuleConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public AndInvariantRuleConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns AndInvariantRuleConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AndInvariantRuleConfiguration"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_AndInvariantRuleConfiguration_type");

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java
deleted file mode 100644
index 75403891bcf..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/NotInvariantRuleConfigurationItemProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-

-import org.eclipse.emf.edit.provider.ViewerNotification;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class NotInvariantRuleConfigurationItemProvider extends InvariantRuleConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public NotInvariantRuleConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addComposedRulePropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Composed Rule feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void addComposedRulePropertyDescriptor(Object object) {

-		itemPropertyDescriptors.add

-			(createItemPropertyDescriptor

-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

-				 getResourceLocator(),

-				 getString("_UI_NotInvariantRuleConfiguration_composedRule_feature"),

-				 getString("_UI_PropertyDescriptor_description", "_UI_NotInvariantRuleConfiguration_composedRule_feature", "_UI_NotInvariantRuleConfiguration_type"),

-				 InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,

-				 true,

-				 false,

-				 false,

-				 null,

-				 null,

-				 null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns NotInvariantRuleConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NotInvariantRuleConfiguration"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_NotInvariantRuleConfiguration_type");

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(NotInvariantRuleConfiguration.class)) {

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createNotInvariantRuleConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createAndInvariantRuleConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createOrInvariantRuleConfiguration()));

-	}

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java
deleted file mode 100644
index ff94e4b6fd8..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantElementMatcher.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2015 CEA LIST and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *   CEA LIST - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration;

-

-

-public class DefaultInvariantElementMatcher implements IElementMatcher {

-

-

-	InvariantTypeConfiguration configuration;

-

-	public DefaultInvariantElementMatcher(InvariantTypeConfiguration configuration) {

-		this.configuration = configuration;

-	}

-

-	/**

-	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param eObject

-	 * @return

-	 */

-	@Override

-	public boolean matches(EObject eObject) {

-		InvariantRuleConfiguration invariantRuleConfiguration = configuration.getInvariantRuleConfiguration();

-

-		return processInvariantRule(invariantRuleConfiguration, eObject);

-	}

-

-	/**

-	 * @param invariantRuleConfiguration

-	 * @param eObject

-	 * @return

-	 */

-	protected boolean processInvariantRule(InvariantRuleConfiguration invariantRuleConfiguration, EObject eObject) {

-		if (invariantRuleConfiguration instanceof CompositeInvariantRuleConfiguration) {

-			return processCompositeRule((CompositeInvariantRuleConfiguration) invariantRuleConfiguration, eObject);

-		} else if (invariantRuleConfiguration instanceof NotInvariantRuleConfiguration) {

-			InvariantRuleConfiguration composedRule = ((NotInvariantRuleConfiguration) invariantRuleConfiguration).getComposedRule();

-			return !processInvariantRule(composedRule, eObject);

-		} else {

-			return InvariantRuleConfigurationTypeRegistry.getInstance().getInvariantRule(invariantRuleConfiguration).matches(eObject);

-		}

-	}

-

-	/**

-	 * @param compositeRule

-	 * @param eObject

-	 * @return

-	 */

-	protected boolean processCompositeRule(CompositeInvariantRuleConfiguration compositeRule, EObject eObject) {

-		Iterator<InvariantRuleConfiguration> iterator = compositeRule.getComposedRules().iterator();

-		InvariantRuleConfiguration nextComposedRuleConfiguration = iterator.next();

-		boolean result = processInvariantRule(nextComposedRuleConfiguration, eObject);

-

-		while (iterator.hasNext()) {

-			nextComposedRuleConfiguration = iterator.next();

-

-			boolean resultNextComposedRuleConfiguration = processInvariantRule(nextComposedRuleConfiguration, eObject);

-

-			if (compositeRule instanceof OrInvariantRuleConfiguration) {

-				if (result == false && resultNextComposedRuleConfiguration) {

-					result = true;

-				}

-			} else if (compositeRule instanceof AndInvariantRuleConfiguration) {

-				if (result == true && !resultNextComposedRuleConfiguration) {

-					result = false;

-				}

-			}

-		}

-

-		return result;

-	}

-

-

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java
deleted file mode 100644
index c90bb9b2571..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantRule.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2014 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;

-

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-

-public class DefaultInvariantRule implements IInvariantRule<InvariantRuleConfiguration> {

-

-

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

-	 *

-	 * @param request

-	 * @return

-	 */

-	@Override

-	public boolean approveRequest(IEditCommandRequest request) {

-		// TODO Auto-generated method stub

-		return true;

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#init(org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration)

-	 *

-	 * @param invariantRuleConfiguration

-	 */

-	@Override

-	public void init(InvariantRuleConfiguration invariantRuleConfiguration) {

-

-	}

-

-	/**

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#matches(org.eclipse.emf.ecore.EObject)

-	 *

-	 * @param eObject

-	 * @return

-	 */

-	@Override

-	public boolean matches(EObject eObject) {

-		return true;

-	}

-

-

-}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.project b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.project
deleted file mode 100644
index 510c4f7ec96..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.core.resources.prefs b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b5f4245b1fe..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1

-encoding//model/ElementTypesConfigurations.ecore=UTF-8

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
deleted file mode 100644
index 3d917c000d5..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations,
- org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints,
- org.eclipse.papyrus.infra.elementtypesconfigurations.factories,
- org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl,
- org.eclipse.papyrus.infra.elementtypesconfigurations.impl,
- org.eclipse.papyrus.infra.elementtypesconfigurations.notification,
- org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events,
- org.eclipse.papyrus.infra.elementtypesconfigurations.registries,
- org.eclipse.papyrus.infra.elementtypesconfigurations.resource,
- org.eclipse.papyrus.infra.elementtypesconfigurations.util,
- org.eclipse.papyrus.infra.elementtypesconfigurations.utils
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
deleted file mode 100644
index 1370cb96765..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
- Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
- 
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
-   CEA LIST - Initial API and implementation
-   Christian W. Damus - bug 485220
--->
-<plugin>
-	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>
-	<extension-point id="elementTypeConfigurationType" name="ElementType Configuration Type" schema="schema/elementTypeConfigurationType.exsd"/>
-	<extension-point id="adviceConfigurationType" name="Advice Configuration Type" schema="schema/adviceConfigurationType.exsd"/>
-	<extension-point id="containerConfigurationType" name="Container Configuration Type" schema="schema/containerConfigurationType.exsd"/>
-	<extension-point id="matcherConfigurationType" name="Matcher Configuration Type" schema="schema/matcherConfigurationType.exsd"/>
-   
-   <extension
-         point="org.eclipse.papyrus.infra.core.service">
-      <service
-            classname="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypesConfigurationsRegistryService"
-            description="Service used to registrer elementTypes in the GMF elementTypes registry"
-            id="ElementTypesConfigurationsRegistryService"
-            priority="50"
-            startKind="startup">
-      </service>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <parser
-            type="elementtypesconfigurations"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.resource.CustomElementtypesconfigurationsResourceFactoryImpl"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated ElementTypesConfigurations -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage"
-            genModel="model/ElementTypesConfigurations.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.content_parser">
-      <!-- @generated ElementTypesConfigurations -->
-      <parser
-            contentTypeIdentifier="org.eclipse.papyrus.infra.elementtypesconfigurations"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.core.contenttype.contentTypes">
-      <!-- @generated ElementTypesConfigurations -->
-      <content-type
-            base-type="org.eclipse.emf.ecore.xmi"
-            file-extensions="elementtypesconfigurations"
-            id="org.eclipse.papyrus.infra.elementtypesconfigurations"
-            name="%_UI_Elementtypesconfigurations_content_type"
-            priority="normal">
-         <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-            <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"/>
-            <parameter name="kind" value="xmi"/>
-         </describer>
-      </content-type>
-   </extension>
-</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IUserElementTypeDefinitionsExtensionPoint.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IUserElementTypeDefinitionsExtensionPoint.java
deleted file mode 100644
index 971d9e11bc1..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IUserElementTypeDefinitionsExtensionPoint.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-
-public interface IUserElementTypeDefinitionsExtensionPoint {
-
-	/** ID of the extension point */
-	String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".userDefinitions";
-
-	/** element: provider of user definitions */
-	String E_PROVIDER = "provider";
-
-	/** attribute: class implementing the provider */
-	String A_CLASS = "class";
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java
deleted file mode 100644
index 413b3fdf55f..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsEventsChain.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AbstractElementTypesConfigurationsEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;
-
-public class ElementTypesConfigurationsEventsChain {
-
-	/**
-	 * Timestamp of the creation of the chain
-	 */
-	private long timestamp;
-
-	/**
-	 * The {@link IEditHelper} that triggered the {@link ElementTypesConfigurationsEventsChain}
-	 */
-	private IEditHelper editHelper;
-
-	/**
-	 * The {@link IEditCommandRequest} that triggered the {@link ElementTypesConfigurationsEventsChain}
-	 */
-	private IEditCommandRequest req;
-
-	ElementTypesConfigurationsEventsChain(IEditHelper editHelper, IEditCommandRequest req) {
-		timestamp = System.currentTimeMillis();
-		this.editHelper = editHelper;
-		this.req = req;
-	}
-
-	/**
-	 * The various categories of events that occur during the execution of the {@link IEditHelper}
-	 */
-	private List<AbstractElementTypesConfigurationsEvent> adviceRequestConfigurationEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
-
-	private AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent = null;
-
-	private List<AbstractElementTypesConfigurationsEvent> adviceApprovalEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
-
-	private AbstractElementTypesConfigurationsEvent editHelperApprovalEvent = null;
-
-	private List<AbstractElementTypesConfigurationsEvent> beforeAdvicesCommandsEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
-
-	private List<AbstractElementTypesConfigurationsEvent> afterAdvicesCommandsEvents = new ArrayList<AbstractElementTypesConfigurationsEvent>();
-
-	private AbstractElementTypesConfigurationsEvent editHelperCommandEvent = null;
-
-	/**
-	 * @return the adviceApprovalEvents
-	 */
-	public List<AbstractElementTypesConfigurationsEvent> getAdviceApprovalEvents() {
-		return adviceApprovalEvents;
-	}
-
-	/**
-	 * Add a {@link AdviceDisapprovedEvent} or {@link AdviceApprovedEvent} event
-	 * 
-	 * @param adviceApprovalEvent
-	 */
-	public void addAdviceApprovalEvent(AbstractElementTypesConfigurationsEvent adviceApprovalEvent) {
-		if(adviceApprovalEvent instanceof AdviceDisapprovedEvent || adviceApprovalEvent instanceof AdviceApprovedEvent) {
-			adviceApprovalEvents.add(adviceApprovalEvent);
-		}
-	}
-
-	/**
-	 * @return the editHelperAprrovalEvent
-	 */
-	public AbstractElementTypesConfigurationsEvent getEditHelperApprovalEvent() {
-		return editHelperApprovalEvent;
-	}
-
-	/**
-	 * @param editHelperAprrovalEvent
-	 *        the editHelperAprrovalEvent to set
-	 */
-	public void setEditHelperApprovalEvent(AbstractElementTypesConfigurationsEvent editHelperApprovalEvent) {
-		if(editHelperApprovalEvent instanceof EditHelperDisapprovedEvent || editHelperApprovalEvent instanceof EditHelperApprovedEvent) {
-			this.editHelperApprovalEvent = editHelperApprovalEvent;
-		}
-	}
-
-	/**
-	 * @return the beforeAdvicesCommandsEvents
-	 */
-	public List<AbstractElementTypesConfigurationsEvent> getBeforeAdvicesCommandsEvents() {
-		return beforeAdvicesCommandsEvents;
-	}
-
-	/**
-	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event
-	 * 
-	 * @param beforeAdvicesCommandsEvents
-	 *        the beforeAdvicesCommandsEvents to set
-	 */
-	public void addBeforeAdvicesCommandsEvent(AbstractElementTypesConfigurationsEvent beforeAdvicesCommandEvent) {
-		if(beforeAdvicesCommandEvent instanceof ExecutableAdviceEvent || beforeAdvicesCommandEvent instanceof UnexecutableAdviceEvent || beforeAdvicesCommandEvent instanceof IdentityAdviceEvent) {
-			beforeAdvicesCommandsEvents.add(beforeAdvicesCommandEvent);
-		}
-	}
-
-	/**
-	 * @return the afterAdvicesCommandsEvents
-	 */
-	public List<AbstractElementTypesConfigurationsEvent> getAfterAdvicesCommandsEvents() {
-		return afterAdvicesCommandsEvents;
-	}
-
-	/**
-	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event
-	 * 
-	 * @param afterAdvicesCommandEvent
-	 */
-	public void addAfterAdvicesCommandsEvent(AbstractElementTypesConfigurationsEvent afterAdvicesCommandEvent) {
-		if(afterAdvicesCommandEvent instanceof ExecutableAdviceEvent || afterAdvicesCommandEvent instanceof UnexecutableAdviceEvent || afterAdvicesCommandEvent instanceof IdentityAdviceEvent) {
-			afterAdvicesCommandsEvents.add(afterAdvicesCommandEvent);
-		}
-	}
-
-	/**
-	 * @return the editHelperCommandEvent
-	 */
-	public AbstractElementTypesConfigurationsEvent getEditHelperCommandEvent() {
-		return editHelperCommandEvent;
-	}
-
-	/**
-	 * @param editHelperCommandEvent
-	 *        the editHelperCommandEvent to set ({@link ExecutableEditHelperEvent}, {@link UnexecutableEditHelperEvent} or
-	 *        {@link IdentityEditHelperEvent})
-	 */
-	public void setEditHelperCommandEvent(AbstractElementTypesConfigurationsEvent editHelperCommandEvent) {
-		if(editHelperCommandEvent instanceof ExecutableEditHelperEvent || editHelperCommandEvent instanceof UnexecutableEditHelperEvent || editHelperCommandEvent instanceof IdentityEditHelperEvent) {
-			this.editHelperCommandEvent = editHelperCommandEvent;
-		}
-	}
-
-	/**
-	 * Returns all the events that occurred during the execution of the {@link IEditHelper} (i.e. all events categories)
-	 * 
-	 * @return
-	 */
-	public List<AbstractElementTypesConfigurationsEvent> getAllEvents() {
-		List<AbstractElementTypesConfigurationsEvent> result = new ArrayList<AbstractElementTypesConfigurationsEvent>();
-		if(!adviceRequestConfigurationEvents.isEmpty()) {
-			result.addAll(adviceRequestConfigurationEvents);
-		}
-		if(editHelperRequestConfigurationEvent != null) {
-			result.add(editHelperRequestConfigurationEvent);
-		}
-		if(!adviceApprovalEvents.isEmpty()) {
-			result.addAll(adviceApprovalEvents);
-		}
-		if(editHelperApprovalEvent != null) {
-			result.add(editHelperApprovalEvent);
-		}
-		if(!beforeAdvicesCommandsEvents.isEmpty()) {
-			result.addAll(beforeAdvicesCommandsEvents);
-		}
-		if(editHelperCommandEvent != null) {
-			result.add(editHelperCommandEvent);
-		}
-		if(!afterAdvicesCommandsEvents.isEmpty()) {
-			result.addAll(afterAdvicesCommandsEvents);
-		}
-		return result;
-	}
-
-	/**
-	 * @return the timestamp creation of this {@link ElementTypesConfigurationsEventsChain}
-	 */
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	/**
-	 * @return the req
-	 */
-	public IEditCommandRequest getRequest() {
-		return req;
-	}
-
-	/**
-	 * The Simple Name of the class of the {@link IEditHelper} that triggered this {@link ElementTypesConfigurationsEventsChain}
-	 * 
-	 * @return
-	 */
-	public String getName() {
-		return editHelper.getClass().getSimpleName();
-	}
-
-	/**
-	 * @return the adviceRequestConfigurationEvents
-	 */
-	public List<AbstractElementTypesConfigurationsEvent> getAdviceRequestConfigurationEvents() {
-		return adviceRequestConfigurationEvents;
-	}
-
-	/**
-	 * @param adviceConfigureEvent
-	 */
-	public void addAdviceRequestConfigurationEvent(AdviceRequestConfigurationEvent adviceConfigureEvent) {
-		adviceRequestConfigurationEvents.add(adviceConfigureEvent);
-	}
-
-	/**
-	 * @return the editHelperRequestConfigurationEvent
-	 */
-	public AbstractElementTypesConfigurationsEvent getEditHelperRequestConfigurationEvent() {
-		return editHelperRequestConfigurationEvent;
-	}
-
-	/**
-	 * @param editHelperRequestConfigurationEvent
-	 *        the editHelperRequestConfigurationEvent to set
-	 */
-	public void setEditHelperRequestConfigurationEvent(AbstractElementTypesConfigurationsEvent editHelperRequestConfigurationEvent) {
-		this.editHelperRequestConfigurationEvent = editHelperRequestConfigurationEvent;
-	}
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java
deleted file mode 100644
index 9606f9a38cc..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/ElementTypesConfigurationsListenersRegistry.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
-
-/**
- * Singleton used to register eventsChains listeners ({@link IElementTypesConfigurationsEventsChainListener})
- */
-public class ElementTypesConfigurationsListenersRegistry {
-
-	private static Set<IElementTypesConfigurationsEventsChainListener> eventChainListeners = null;
-
-	private static Set<IElementTypesConfigurationsEventsListener> eventListeners = null;
-
-	private static ElementTypesConfigurationsListenersRegistry instance = null;
-
-	private ElementTypesConfigurationsListenersRegistry() {
-	}
-
-	public static synchronized ElementTypesConfigurationsListenersRegistry getInstance() {
-		if (instance == null) {
-			instance = new ElementTypesConfigurationsListenersRegistry();
-			init();
-		}
-		return instance;
-	}
-
-	public static void init() {
-		eventChainListeners = new HashSet<IElementTypesConfigurationsEventsChainListener>();
-		eventListeners = new HashSet<IElementTypesConfigurationsEventsListener>();
-	}
-
-	public void addEventChainListener(IElementTypesConfigurationsEventsChainListener listener) {
-		eventChainListeners.add(listener);
-	}
-
-	public void removeEventChainListener(IElementTypesConfigurationsEventsChainListener listener) {
-		eventChainListeners.remove(listener);
-	}
-
-	public void addEventListener(IElementTypesConfigurationsEventsListener listener) {
-		eventListeners.add(listener);
-	}
-
-	public void removeEventChainListener(IElementTypesConfigurationsEventsListener listener) {
-		eventListeners.remove(listener);
-	}
-
-	public void notifyChain(ElementTypesConfigurationsEventsChain chain) {
-		for (IElementTypesConfigurationsEventsChainListener eventsChainListener : eventChainListeners) {
-			eventsChainListener.notifyChain(chain);
-		}
-	}
-
-	public void notifyEvent(IElementTypesConfigurationsEvent event) {
-		for (IElementTypesConfigurationsEventsListener eventsListener : eventListeners) {
-			eventsListener.notifyEvent(event);
-		}
-	}
-}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java b/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java
deleted file mode 100644
index f6996126c0b..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractRequestConfigurationEvent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractRequestConfigurationEvent extends AbstractElementTypesConfigurationsEvent {
-
-	public AbstractRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
-	 *
-	 * @return
-	 */
-	@Override
-	public ElementTypesConfigurationsEventType getEventType() {
-		return ElementTypesConfigurationsEventType.RequestConfiguration;
-	}
-}
diff --git a/plugins/infra/pom.xml b/plugins/infra/pom.xml
index 003f997e1ee..c347c3a4531 100644
--- a/plugins/infra/pom.xml
+++ b/plugins/infra/pom.xml
@@ -22,14 +22,7 @@
 		<module>services</module>
 		<module>newchild</module>
 
-		<!-- These are not in a subdirectory because other refactorings are in progress -->
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations</module>
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.edit</module>
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.editor</module>
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.emf</module>
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui</module>
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes</module>
-		<module>org.eclipse.papyrus.infra.elementtypesconfigurations.ui</module>
+		<module>types</module>
 
 		<module>viewpoints</module>
 		<module>nattable</module>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath
new file mode 100644
index 00000000000..eca7bdba8f0
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project
new file mode 100644
index 00000000000..1ff0577ad7b
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.types.core</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs
index 62a08f4494d..62a08f4494d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0bd7772f3da
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0";visibility:=reexport

+Export-Package: org.eclipse.papyrus.infra.types.core,

+ org.eclipse.papyrus.infra.types.core.extensionpoints,

+ org.eclipse.papyrus.infra.types.core.factories,

+ org.eclipse.papyrus.infra.types.core.factories.impl,

+ org.eclipse.papyrus.infra.types.core.impl,

+ org.eclipse.papyrus.infra.types.core.notification,

+ org.eclipse.papyrus.infra.types.core.notification.events,

+ org.eclipse.papyrus.infra.types.core.registries,

+ org.eclipse.papyrus.infra.types.core.utils

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-Activator: org.eclipse.papyrus.infra.types.core.Activator

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.core;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/build.properties
index 9e8f4164078..5d2b514cb3c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/build.properties
@@ -2,7 +2,6 @@
 #Mon Sep 12 09:29:52 CEST 2011
 output..=bin/
 bin.includes = .,\
-               model/,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
@@ -10,6 +9,5 @@ bin.includes = .,\
                about.html
 jars.compile.order=.
 src.includes = about.html
-source.. = src-gen/,\
-           src/
+source.. = src/
 bin..=bin/
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
index 546874c1e51..546874c1e51 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.properties
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml
new file mode 100644
index 00000000000..2c94fe32289
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/plugin.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+<!--

+ Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.

+ 

+ All rights reserved. This program and the accompanying materials

+ are made available under the terms of the Eclipse Public License v1.0

+ which accompanies this distribution, and is available at

+ http://www.eclipse.org/legal/epl-v10.html

+

+ Contributors:

+   CEA LIST - Initial API and implementation

+   Christian W. Damus - bug 485220

+-->

+<plugin>

+	<extension-point id="elementTypeSetConfiguration" name="ElementType Set Configuration" schema="schema/elementTypeSetConfiguration.exsd"/>

+	<extension-point id="elementTypeConfigurationKind" name="ElementType Configuration Kind" schema="schema/elementTypeConfigurationKind.exsd"/>

+	<extension-point id="adviceConfigurationKind" name="Advice Configuration Kind" schema="schema/adviceConfigurationKind.exsd"/>

+	<extension-point id="containerConfigurationKind" name="Container Configuration Kind" schema="schema/containerConfigurationKind.exsd"/>

+	<extension-point id="matcherConfigurationKind" name="Matcher Configuration Kind" schema="schema/matcherConfigurationKind.exsd"/>

+   

+   <extension

+         point="org.eclipse.papyrus.infra.core.service">

+      <service

+            classname="org.eclipse.papyrus.infra.types.core.TypesConfigurationsRegistryService"

+            description="Service used to registrer elementTypes in the GMF elementTypes registry"

+            id="ElementTypesConfigurationsRegistryService"

+            priority="50"

+            startKind="startup">

+      </service>

+   </extension>

+

+

+

+</plugin>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml
index 6fa070e3e02..affbc6c6eb8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/pom.xml
@@ -2,11 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-types</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.emf</artifactId>
+	<artifactId>org.eclipse.papyrus.infra.types.core</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/adviceConfigurationType.exsd b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/adviceConfigurationKind.exsd
index 8ac0b4648fb..8734ce9b975 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/adviceConfigurationType.exsd
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/adviceConfigurationKind.exsd
@@ -1,126 +1,126 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="adviceConfigurationType" name="Advice Configuration Type"/>

-      </appInfo>

-      <documentation>

-         Extension point to describe new kind of Pre/Post actions in the elementTypesConfigurations framework.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="adviceConfigurationType"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="adviceConfigurationType">

-      <complexType>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IEditHelperAdviceFactory"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="configurationClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.10.1

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         See examples in the emf or uml elementTypes configurations

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiinfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2014 CEA LIST

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0 which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-Contributors:

-CEA LIST - initial API and implementation

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.types.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.types.core" id="adviceConfigurationKind" name="Advice Configuration Kind"/>
+      </appInfo>
+      <documentation>
+         Extension point to describe new kind of Pre/Post actions in the elementTypesConfigurations framework.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="adviceConfigurationKind"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="adviceConfigurationKind">
+      <complexType>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.core.factories.IEditHelperAdviceFactory"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="configurationClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.AdviceConfiguration"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.10.1
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         See examples in the emf or uml elementTypes configurations
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2014 CEA LIST
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+CEA LIST - initial API and implementation
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/containerConfigurationType.exsd b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/containerConfigurationKind.exsd
index 21200a47281..2946e38e2d5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/containerConfigurationType.exsd
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/containerConfigurationKind.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="containerConfigurationType" name="Container Configuration Type"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to registered new kind of container configuration

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="containerConfigurationType"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="containerConfigurationType">

-      <complexType>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IContainerFactory"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="configurationClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.10.2

-      </documentation>

-   </annotation>

-

-

-

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2010-2013 CEA LIST

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0 which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-Contributors:

-CEA LIST - initial API and implementation

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.types.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.types.core" id="containerConfigurationKind" name="Container Configuration Kind"/>
+      </appInfo>
+      <documentation>
+         This extension point is used to registered new kind of container configuration
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="containerConfigurationKind"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="containerConfigurationKind">
+      <complexType>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.core.factories.IContainerFactory"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="configurationClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.ContainerConfiguration"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.10.2
+      </documentation>
+   </annotation>
+
+
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2010-2013 CEA LIST
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+CEA LIST - initial API and implementation
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeConfigurationType.exsd b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/elementTypeConfigurationKind.exsd
index 2fcad02d588..b2e6f2c2947 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeConfigurationType.exsd
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/elementTypeConfigurationKind.exsd
@@ -1,107 +1,107 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="elementTypeConfigurationType" name="ElementType Configuration Type"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to registered new kind of elementTypes configuration

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="elementTypeConfigurationType"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="elementTypeConfigurationType">

-      <annotation>

-         <documentation>

-            define a new configuration for an elementTypes set

-         </documentation>

-      </annotation>

-      <complexType>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IElementTypeConfigurationFactory"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="configurationClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  Configuration class of the elementType.

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.10.2

-      </documentation>

-   </annotation>

-

-

-

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2010-2013 CEA LIST

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0 which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-Contributors:

-CEA LIST - initial API and implementation

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.types.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.types.core" id="elementTypeConfigurationKind" name="ElementType Configuration Kind"/>
+      </appInfo>
+      <documentation>
+         This extension point is used to registered new kind of elementTypes configuration
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="elementTypeConfigurationKind"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="elementTypeConfigurationKind">
+      <annotation>
+         <documentation>
+            define a new configuration for an elementTypes set
+         </documentation>
+      </annotation>
+      <complexType>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.core.factories.IElementTypeConfigurationFactory"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="configurationClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  Configuration class of the elementType.
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.ElementTypeConfiguration"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.10.2
+      </documentation>
+   </annotation>
+
+
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2010-2013 CEA LIST
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+CEA LIST - initial API and implementation
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeSetConfiguration.exsd b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/elementTypeSetConfiguration.exsd
index d5a290b5ad3..1f2b003b1e2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/elementTypeSetConfiguration.exsd
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/elementTypeSetConfiguration.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.infra.types.core" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="elementTypeSetConfiguration" name="ElementType Set Configuration"/>
+         <meta.schema plugin="org.eclipse.papyrus.infra.types.core" id="elementTypeSetConfiguration" name="ElementType Set Configuration"/>
       </appInfo>
       <documentation>
          This extension point is used to registered elementType sets configuration models
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/matcherConfigurationType.exsd b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/matcherConfigurationKind.exsd
index 8f34af56c0f..525c23db524 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/schema/matcherConfigurationType.exsd
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/schema/matcherConfigurationKind.exsd
@@ -1,102 +1,102 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appInfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations" id="matcherConfigurationType" name="Matcher Configuration Type"/>

-      </appInfo>

-      <documentation>

-         This extension point is used to registered new kind of matcher configuration

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appInfo>

-            <meta.element />

-         </appInfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="matcherConfigurationType"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute translatable="true"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="matcherConfigurationType">

-      <complexType>

-         <attribute name="factoryClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-         <attribute name="configurationClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="since"/>

-      </appInfo>

-      <documentation>

-         0.10.2

-      </documentation>

-   </annotation>

-

-

-

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         Copyright (c) 2010-2013 CEA LIST

-All rights reserved. This program and the accompanying materials

-are made available under the terms of the Eclipse Public License

-v1.0 which accompanies this distribution, and is available at

-http://www.eclipse.org/legal/epl-v10.html

-Contributors:

-CEA LIST - initial API and implementation

-      </documentation>

-   </annotation>

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.types.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.types.core" id="matcherConfigurationKind" name="Matcher Configuration Kind"/>
+      </appInfo>
+      <documentation>
+         This extension point is used to registered new kind of matcher configuration
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="matcherConfigurationKind"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="matcherConfigurationKind">
+      <complexType>
+         <attribute name="factoryClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+         <attribute name="configurationClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.MatcherConfiguration"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         0.10.2
+      </documentation>
+   </annotation>
+
+
+
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         Copyright (c) 2010-2013 CEA LIST
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+Contributors:
+CEA LIST - initial API and implementation
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/Activator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/Activator.java
index 6c24940b344..0aa038b9c17 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/Activator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/Activator.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 485220
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types.core;
 
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.papyrus.infra.core.log.LogHelper;
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.types.core"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredContainerDescriptor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredContainerDescriptor.java
index f71c8b3b57d..1f669657cfd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredContainerDescriptor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredContainerDescriptor.java
@@ -10,10 +10,11 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations;

+package org.eclipse.papyrus.infra.types.core;

 

 import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;

+import org.eclipse.papyrus.infra.types.ContainerConfiguration;

+

 

 /**

  * Descriptor for the configurable container descriptor

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredEditHelperAdviceDescriptor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredEditHelperAdviceDescriptor.java
index 28ecdea1668..872b2a3c651 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredEditHelperAdviceDescriptor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredEditHelperAdviceDescriptor.java
@@ -11,9 +11,10 @@
  *  Christian W. Damus - bug 459174

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations;

+package org.eclipse.papyrus.infra.types.core;

 

 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

+import org.eclipse.papyrus.infra.types.AdviceConfiguration;

 

 public interface IConfiguredEditHelperAdviceDescriptor<T extends AdviceConfiguration> extends IAdviceBindingDescriptor {

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredHintedElementType.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredHintedElementType.java
index 3fdc760a6e2..4547c75c070 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/IConfiguredHintedElementType.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/IConfiguredHintedElementType.java
@@ -11,9 +11,10 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.infra.elementtypesconfigurations;

+package org.eclipse.papyrus.infra.types.core;

 

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

 

 

 public interface IConfiguredHintedElementType extends IHintedType {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypesConfigurationsRegistryService.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/TypesConfigurationsRegistryService.java
index 40f3b6ed5f9..ce1c5c024f9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypesConfigurationsRegistryService.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/TypesConfigurationsRegistryService.java
@@ -10,17 +10,17 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types.core;
 
 import org.eclipse.papyrus.infra.core.services.IService;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 
 /**
  * Service to register elementTypes configurations
  */
-public class ElementTypesConfigurationsRegistryService implements IService {
+public class TypesConfigurationsRegistryService implements IService {
 
 	/**
 	 * {@inheritDoc}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IAdviceConfigurationTypeExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java
index 8db7d65190f..1def9adfa2c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IAdviceConfigurationTypeExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IAdviceKindExtensionPoint.java
@@ -10,14 +10,14 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints;
+package org.eclipse.papyrus.infra.types.core.extensionpoints;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
+import org.eclipse.papyrus.infra.types.core.Activator;
 
-public interface IAdviceConfigurationTypeExtensionPoint {
+public interface IAdviceKindExtensionPoint {
 
 	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".adviceConfigurationType";
+	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".adviceConfigurationKind";
 
 	public static final String FACTORY_CLASS = "factoryClass";
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IContainerConfigurationTypeExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IContainerConfigurationKindExtensionPoint.java
index 91149c9d2e2..6acdfbe21e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IContainerConfigurationTypeExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IContainerConfigurationKindExtensionPoint.java
@@ -10,14 +10,14 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints;
+package org.eclipse.papyrus.infra.types.core.extensionpoints;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
+import org.eclipse.papyrus.infra.types.core.Activator;
 
-public interface IContainerConfigurationTypeExtensionPoint {
+public interface IContainerConfigurationKindExtensionPoint {
 
 	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".containerConfigurationType";
+	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".containerConfigurationKind";
 
 	public static final String FACTORY_CLASS = "factoryClass";
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeConfigurationTypeExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeConfigurationKindExtensionPoint.java
index 63b1ae9e94b..a39a19da6d4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeConfigurationTypeExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeConfigurationKindExtensionPoint.java
@@ -10,17 +10,17 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints;
+package org.eclipse.papyrus.infra.types.core.extensionpoints;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
+import org.eclipse.papyrus.infra.types.core.Activator;
 
 /**
  * Constants for the extension point elementTypeConfigurationType
  */
-public interface IElementTypeConfigurationTypeExtensionPoint {
+public interface IElementTypeConfigurationKindExtensionPoint {
 
 	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementTypeConfigurationType";
+	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".elementTypeConfigurationKind";
 
 	/** attribute factoryClass */
 	public static final String FACTORY_CLASS = "factoryClass";
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeSetExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeSetExtensionPoint.java
index c0461c0515b..24a09884fed 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IElementTypeSetExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IElementTypeSetExtensionPoint.java
@@ -10,9 +10,9 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints;
+package org.eclipse.papyrus.infra.types.core.extensionpoints;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
+import org.eclipse.papyrus.infra.types.core.Activator;
 
 public interface IElementTypeSetExtensionPoint {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IMatcherConfigurationTypeExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IMatcherConfigurationKindExtensionPoint.java
index c48aa96a6b6..819e9d32814 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/extensionpoints/IMatcherConfigurationTypeExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/extensionpoints/IMatcherConfigurationKindExtensionPoint.java
@@ -10,17 +10,17 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints;
+package org.eclipse.papyrus.infra.types.core.extensionpoints;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
+import org.eclipse.papyrus.infra.types.core.Activator;
 
 /**
  * Constants for the extension point matcherConfigurationType
  */
-public interface IMatcherConfigurationTypeExtensionPoint {
+public interface IMatcherConfigurationKindExtensionPoint {
 
 	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".matcherConfigurationType";
+	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".matcherConfigurationKind";
 
 	/** attribute factoryClass */
 	public static final String FACTORY_CLASS = "factoryClass";
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IContainerFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IContainerFactory.java
index eda587f996f..676136c7be3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IContainerFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IContainerFactory.java
@@ -10,10 +10,10 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories;
+package org.eclipse.papyrus.infra.types.core.factories;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredContainerDescriptor;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.core.IConfiguredContainerDescriptor;
 
 public interface IContainerFactory<T extends ContainerConfiguration> {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IEditHelperAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IEditHelperAdviceFactory.java
index 5e4f78d574b..7a3831cbc76 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IEditHelperAdviceFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IEditHelperAdviceFactory.java
@@ -10,10 +10,10 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories;
+package org.eclipse.papyrus.infra.types.core.factories;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredEditHelperAdviceDescriptor;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.core.IConfiguredEditHelperAdviceDescriptor;
 
 public interface IEditHelperAdviceFactory<T extends AdviceConfiguration> {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IElementTypeConfigurationFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IElementTypeConfigurationFactory.java
index c23440749bd..2d5007089dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IElementTypeConfigurationFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IElementTypeConfigurationFactory.java
@@ -10,10 +10,10 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories;
+package org.eclipse.papyrus.infra.types.core.factories;
 
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
 
 public interface IElementTypeConfigurationFactory<T extends ElementTypeConfiguration> {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IMatcherFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IMatcherFactory.java
index 91ef55ac3cc..f72433f2090 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/IMatcherFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/IMatcherFactory.java
@@ -10,10 +10,10 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories;
+package org.eclipse.papyrus.infra.types.core.factories;
 
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 
 public interface IMatcherFactory<T extends AbstractMatcherConfiguration> {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceBindingFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
index 200be497ffd..1bb0959254d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceBindingFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceBindingFactory.java
@@ -1,60 +1,60 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;
-
-public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindingConfiguration> extends AbstractAdviceFactory<T> {
-
-	@Override
-	protected String getTypeId(T adviceConfiguration) {
-		return adviceConfiguration.getTarget().getIdentifier();
-	}
-
-	@Override
-	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {
-		ContainerConfiguration containerConfiguration = adviceConfiguration.getContainerConfiguration();
-		if (containerConfiguration == null) {
-			return null;
-		}
-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
-		return containerDescriptor;
-	}
-
-	@Override
-	protected IElementMatcher getMatcher(T adviceConfiguration) {
-		AbstractMatcherConfiguration matcherConfiguration = adviceConfiguration.getMatcherConfiguration();
-		if (matcherConfiguration == null) {
-			return null;
-		}
-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
-		return matcher;
-	}
-
-	@Override
-	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {
-		return AdviceBindingInheritance.getAdviceBindingInheritance(adviceConfiguration.getInheritance().getName());
-	}
-
-	@Override
-	protected String getId(T adviceConfiguration) {
-		return adviceConfiguration.getIdentifier();
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.factories.impl;

+

+import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;

+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;

+import org.eclipse.papyrus.infra.types.ContainerConfiguration;

+import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;

+import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;

+

+public abstract class AbstractAdviceBindingFactory<T extends AbstractAdviceBindingConfiguration> extends AbstractAdviceFactory<T> {

+

+	@Override

+	protected String getTypeId(T adviceConfiguration) {

+		return adviceConfiguration.getTarget().getIdentifier();

+	}

+

+	@Override

+	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {

+		ContainerConfiguration containerConfiguration = adviceConfiguration.getContainerConfiguration();

+		if (containerConfiguration == null) {

+			return null;

+		}

+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

+		return containerDescriptor;

+	}

+

+	@Override

+	protected IElementMatcher getMatcher(T adviceConfiguration) {

+		AbstractMatcherConfiguration matcherConfiguration = adviceConfiguration.getMatcherConfiguration();

+		if (matcherConfiguration == null) {

+			return null;

+		}

+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

+		return matcher;

+	}

+

+	@Override

+	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {

+		return AdviceBindingInheritance.getAdviceBindingInheritance(adviceConfiguration.getInheritance().getName());

+	}

+

+	@Override

+	protected String getId(T adviceConfiguration) {

+		return adviceConfiguration.getIdentifier();

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceFactory.java
index 082c916d4fb..b00a766e027 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractAdviceFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractAdviceFactory.java
@@ -11,16 +11,16 @@
  *  Christian W. Damus - bug 459174
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+package org.eclipse.papyrus.infra.types.core.factories.impl;
 
 import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
 import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredEditHelperAdviceDescriptor;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IEditHelperAdviceFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredEditHelperAdviceDescriptor;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.core.IConfiguredEditHelperAdviceDescriptor;
+import org.eclipse.papyrus.infra.types.core.factories.IEditHelperAdviceFactory;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredEditHelperAdviceDescriptor;
 
 public abstract class AbstractAdviceFactory<T extends AdviceConfiguration> implements IEditHelperAdviceFactory<T> {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractEditHelperAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractEditHelperAdviceFactory.java
index 7df9c5612a8..17c8f5e0983 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractEditHelperAdviceFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractEditHelperAdviceFactory.java
@@ -1,61 +1,61 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;
-
-public abstract class AbstractEditHelperAdviceFactory<T extends AbstractEditHelperAdviceConfiguration> extends AbstractAdviceFactory<T> {
-
-	@Override
-	protected String getTypeId(T adviceConfiguration) {
-		return adviceConfiguration.getTarget().getIdentifier();
-	}
-
-	@Override
-	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {
-		return AdviceBindingInheritance.ALL;
-	}
-
-	@Override
-	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {
-		ContainerConfiguration containerConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getContainerConfiguration();
-		if (containerConfiguration == null) {
-			return null;
-		}
-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
-		return containerDescriptor;
-	}
-
-	@Override
-	protected IElementMatcher getMatcher(T adviceConfiguration) {
-		AbstractMatcherConfiguration matcherConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getMatcherConfiguration();
-		if (matcherConfiguration == null) {
-			return null;
-		}
-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
-		return matcher;
-	}
-
-	@Override
-	protected String getId(T adviceConfiguration) {
-		return adviceConfiguration.getTarget().getIdentifier();
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.factories.impl;

+

+import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;

+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;

+import org.eclipse.papyrus.infra.types.ContainerConfiguration;

+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;

+import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;

+import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;

+

+public abstract class AbstractEditHelperAdviceFactory<T extends AbstractEditHelperAdviceConfiguration> extends AbstractAdviceFactory<T> {

+

+	@Override

+	protected String getTypeId(T adviceConfiguration) {

+		return adviceConfiguration.getTarget().getIdentifier();

+	}

+

+	@Override

+	protected AdviceBindingInheritance getInheritance(T adviceConfiguration) {

+		return AdviceBindingInheritance.ALL;

+	}

+

+	@Override

+	protected IContainerDescriptor getContainerDescriptor(T adviceConfiguration) {

+		ContainerConfiguration containerConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getContainerConfiguration();

+		if (containerConfiguration == null) {

+			return null;

+		}

+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

+		return containerDescriptor;

+	}

+

+	@Override

+	protected IElementMatcher getMatcher(T adviceConfiguration) {

+		AbstractMatcherConfiguration matcherConfiguration = ((SpecializationTypeConfiguration) adviceConfiguration.eContainer()).getMatcherConfiguration();

+		if (matcherConfiguration == null) {

+			return null;

+		}

+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

+		return matcher;

+	}

+

+	@Override

+	protected String getId(T adviceConfiguration) {

+		return adviceConfiguration.getTarget().getIdentifier();

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractElementTypeConfigurationFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractElementTypeConfigurationFactory.java
index 1f318799096..f23e83cba80 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/AbstractElementTypeConfigurationFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/AbstractElementTypeConfigurationFactory.java
@@ -10,15 +10,15 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+package org.eclipse.papyrus.infra.types.core.factories.impl;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IElementTypeConfigurationFactory;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.IconEntry;
+import org.eclipse.papyrus.infra.types.core.factories.IElementTypeConfigurationFactory;
 import org.osgi.framework.Bundle;
 
 public abstract class AbstractElementTypeConfigurationFactory<T extends ElementTypeConfiguration> implements IElementTypeConfigurationFactory<T> {
@@ -31,7 +31,7 @@ public abstract class AbstractElementTypeConfigurationFactory<T extends ElementT
 		// icon associated to the elementType (GUI)
 		IconEntry entry = elementTypeConfiguration.getIconEntry();
 		URL iconURL = null;
-		if(entry != null) {
+		if (entry != null) {
 			iconURL = getURLFromEntry(entry);
 		}
 		return iconURL;
@@ -54,11 +54,11 @@ public abstract class AbstractElementTypeConfigurationFactory<T extends ElementT
 	 */
 	protected URL getURLFromEntry(IconEntry entry) {
 		Bundle bundle = Platform.getBundle(entry.getBundleId());
-		if(bundle == null) {
+		if (bundle == null) {
 			return null;
 		}
 		URL result = bundle.getEntry(entry.getIconPath());
-		if(result == null) {
+		if (result == null) {
 			try {
 				result = new URL(entry.getIconPath());
 			} catch (MalformedURLException e) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultAdviceBindingFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultAdviceBindingFactory.java
index c20d3697134..36a8af3bf9d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultAdviceBindingFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultAdviceBindingFactory.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-
-public class DefaultAdviceBindingFactory extends AbstractAdviceBindingFactory<AdviceBindingConfiguration> {
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration)
-	 *
-	 * @param adviceConfiguration
-	 * @return
-	 */
-	@Override
-	protected IEditHelperAdvice getEditHelperAdvice(AdviceBindingConfiguration adviceConfiguration) {
-		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);
-		return editHelperAdvice;
-	}
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.factories.impl;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

+import org.eclipse.papyrus.infra.types.AdviceBindingConfiguration;

+

+public class DefaultAdviceBindingFactory extends AbstractAdviceBindingFactory<AdviceBindingConfiguration> {

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.types.AdviceConfiguration)

+	 *

+	 * @param adviceConfiguration

+	 * @return

+	 */

+	@Override

+	protected IEditHelperAdvice getEditHelperAdvice(AdviceBindingConfiguration adviceConfiguration) {

+		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);

+		return editHelperAdvice;

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultEditHelperAdviceFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultEditHelperAdviceFactory.java
index 12de4cd5365..e4557022b85 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultEditHelperAdviceFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultEditHelperAdviceFactory.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-
-public class DefaultEditHelperAdviceFactory extends AbstractEditHelperAdviceFactory<EditHelperAdviceConfiguration> {
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration)
-	 *
-	 * @param adviceConfiguration
-	 * @return
-	 */
-	@Override
-	protected IEditHelperAdvice getEditHelperAdvice(EditHelperAdviceConfiguration adviceConfiguration) {
-		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);
-		return editHelperAdvice;
-	}
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.factories.impl;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

+import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;

+

+public class DefaultEditHelperAdviceFactory extends AbstractEditHelperAdviceFactory<EditHelperAdviceConfiguration> {

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceFactory#getEditHelperAdvice(org.eclipse.papyrus.infra.types.AdviceConfiguration)

+	 *

+	 * @param adviceConfiguration

+	 * @return

+	 */

+	@Override

+	protected IEditHelperAdvice getEditHelperAdvice(EditHelperAdviceConfiguration adviceConfiguration) {

+		IEditHelperAdvice editHelperAdvice = ClassLoaderHelper.newInstance(adviceConfiguration.getEditHelperAdviceClassName(), IEditHelperAdvice.class);

+		return editHelperAdvice;

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultMatcherFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultMatcherFactory.java
index cdab0ed628b..ba4cf0ae713 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/DefaultMatcherFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/DefaultMatcherFactory.java
@@ -1,34 +1,35 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory;
-import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
-
-public class DefaultMatcherFactory implements IMatcherFactory<MatcherConfiguration> {
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractMatcherFactory#createElementMatcher(org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration)
-	 *
-	 * @param matcherConfiguration
-	 * @return
-	 */
-	@Override
-	public IElementMatcher createElementMatcher(MatcherConfiguration matcherConfiguration) {
-		String matcherClassName = matcherConfiguration.getMatcherClassName();
-		IElementMatcher matcher = ClassLoaderHelper.newInstance(matcherClassName, IElementMatcher.class);
-		return matcher;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.factories.impl;

+

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;

+import org.eclipse.papyrus.infra.types.MatcherConfiguration;

+import org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory;

+

+public class DefaultMatcherFactory implements IMatcherFactory<MatcherConfiguration> {

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory#createElementMatcher(org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration)

+	 *

+	 * @param matcherConfiguration

+	 * @return

+	 */

+	@Override

+	public IElementMatcher createElementMatcher(MatcherConfiguration matcherConfiguration) {

+		String matcherClassName = matcherConfiguration.getMatcherClassName();

+		IElementMatcher matcher = ClassLoaderHelper.newInstance(matcherClassName, IElementMatcher.class);

+		return matcher;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/MetamodelTypeFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/MetamodelTypeFactory.java
index c27f9170547..5bf6f755a67 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/MetamodelTypeFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/MetamodelTypeFactory.java
@@ -10,14 +10,14 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
+package org.eclipse.papyrus.infra.types.core.factories.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedMetamodelElementType;
 import org.eclipse.papyrus.infra.tools.util.ClassLoaderHelper;
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedMetamodelElementType;
 
 public class MetamodelTypeFactory extends AbstractElementTypeConfigurationFactory<MetamodelTypeConfiguration> {
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
index 44c46c1b7af..f790f9f6127 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/factories/impl/SpecializationTypeFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/factories/impl/SpecializationTypeFactory.java
@@ -1,89 +1,89 @@
-/*****************************************************************************
- * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bug 459174
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.AdviceConfigurationTypeRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ContainerConfigurationTypeRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.MatcherConfigurationTypeRegistry;
-
-public class SpecializationTypeFactory extends AbstractElementTypeConfigurationFactory<SpecializationTypeConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {
-		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),
-				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);
-	}
-
-	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {
-		AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration = elementTypeConfiguration.getEditHelperAdviceConfiguration();
-		if (editHelperAdviceConfiguration == null) {
-			return NullEditHelperAdvice.getInstance();
-		}
-		IAdviceBindingDescriptor editHelperAdviceDescriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(editHelperAdviceConfiguration);
-		return editHelperAdviceDescriptor.getEditHelperAdvice();
-	}
-
-	protected IContainerDescriptor createContainerDescriptor(SpecializationTypeConfiguration elementTypeConfiguration) {
-		ContainerConfiguration containerConfiguration = elementTypeConfiguration.getContainerConfiguration();
-		if (containerConfiguration == null) {
-			return null;
-		}
-		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);
-		return containerDescriptor;
-	}
-
-	protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {
-		// Specialized elementTypes
-		List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypesID().size());
-		for (String specializedTypeId : (elementTypeConfiguration).getSpecializedTypesID()) {
-			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeId);
-			if (specializedType != null) {
-				specializedTypes.add(specializedType);
-			} else {
-				Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeId + "\"");
-			}
-		}
-		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});
-		return elementTypes;
-	}
-
-	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {
-		AbstractMatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();
-		if (matcherConfiguration == null) {
-			return null;
-		}
-		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);
-		return matcher;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus - bug 459174

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.factories.impl;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

+import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;

+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;

+import org.eclipse.papyrus.infra.types.ContainerConfiguration;

+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;

+import org.eclipse.papyrus.infra.types.core.Activator;

+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;

+import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;

+import org.eclipse.papyrus.infra.types.core.registries.AdviceConfigurationTypeRegistry;

+import org.eclipse.papyrus.infra.types.core.registries.ContainerConfigurationTypeRegistry;

+import org.eclipse.papyrus.infra.types.core.registries.MatcherConfigurationTypeRegistry;

+

+public class SpecializationTypeFactory extends AbstractElementTypeConfigurationFactory<SpecializationTypeConfiguration> {

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public IHintedType createElementType(SpecializationTypeConfiguration elementTypeConfiguration) {

+		return new ConfiguredHintedSpecializationElementType(getID(elementTypeConfiguration), getIconURL(elementTypeConfiguration), getDisplayName(elementTypeConfiguration), getSpecializedID(elementTypeConfiguration),

+				createElementMatcher(elementTypeConfiguration), createContainerDescriptor(elementTypeConfiguration), getEditHelperAdvice(elementTypeConfiguration), getSemanticHint(elementTypeConfiguration), elementTypeConfiguration);

+	}

+

+	protected IEditHelperAdvice getEditHelperAdvice(SpecializationTypeConfiguration elementTypeConfiguration) {

+		AbstractEditHelperAdviceConfiguration editHelperAdviceConfiguration = elementTypeConfiguration.getEditHelperAdviceConfiguration();

+		if (editHelperAdviceConfiguration == null) {

+			return NullEditHelperAdvice.getInstance();

+		}

+		IAdviceBindingDescriptor editHelperAdviceDescriptor = AdviceConfigurationTypeRegistry.getInstance().getEditHelperAdviceDecriptor(editHelperAdviceConfiguration);

+		return editHelperAdviceDescriptor.getEditHelperAdvice();

+	}

+

+	protected IContainerDescriptor createContainerDescriptor(SpecializationTypeConfiguration elementTypeConfiguration) {

+		ContainerConfiguration containerConfiguration = elementTypeConfiguration.getContainerConfiguration();

+		if (containerConfiguration == null) {

+			return null;

+		}

+		IContainerDescriptor containerDescriptor = ContainerConfigurationTypeRegistry.getInstance().getContainerDescriptor(containerConfiguration);

+		return containerDescriptor;

+	}

+

+	protected IElementType[] getSpecializedID(SpecializationTypeConfiguration elementTypeConfiguration) {

+		// Specialized elementTypes

+		List<IElementType> specializedTypes = new ArrayList<IElementType>((elementTypeConfiguration).getSpecializedTypesID().size());

+		for (String specializedTypeId : (elementTypeConfiguration).getSpecializedTypesID()) {

+			IElementType specializedType = ElementTypeRegistry.getInstance().getType(specializedTypeId);

+			if (specializedType != null) {

+				specializedTypes.add(specializedType);

+			} else {

+				Activator.log.info("Unable to add specialization \"" + getID(elementTypeConfiguration) + "\" to \"" + specializedTypeId + "\"");

+			}

+		}

+		IElementType[] elementTypes = specializedTypes.toArray(new IElementType[] {});

+		return elementTypes;

+	}

+

+	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {

+		AbstractMatcherConfiguration matcherConfiguration = configuration.getMatcherConfiguration();

+		if (matcherConfiguration == null) {

+			return null;

+		}

+		IElementMatcher matcher = MatcherConfigurationTypeRegistry.getInstance().getMatcher(matcherConfiguration);

+		return matcher;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredEditHelperAdviceDescriptor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredEditHelperAdviceDescriptor.java
index 4655297e08c..88b47929651 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredEditHelperAdviceDescriptor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredEditHelperAdviceDescriptor.java
@@ -10,14 +10,14 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;

+package org.eclipse.papyrus.infra.types.core.impl;

 

 import org.eclipse.gmf.runtime.emf.type.core.AdviceBindingInheritance;

 import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;

 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredEditHelperAdviceDescriptor;

+import org.eclipse.papyrus.infra.types.AdviceConfiguration;

+import org.eclipse.papyrus.infra.types.core.IConfiguredEditHelperAdviceDescriptor;

 

 public class ConfiguredEditHelperAdviceDescriptor<T extends AdviceConfiguration> implements IConfiguredEditHelperAdviceDescriptor<T> {

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedMetamodelElementType.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredHintedMetamodelElementType.java
index dbbea14453f..c14be0aecb6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedMetamodelElementType.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredHintedMetamodelElementType.java
@@ -10,16 +10,16 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.core.impl;
 
 import java.net.URL;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.IConfiguredHintedElementType;
 
 public class ConfiguredHintedMetamodelElementType extends MetamodelType implements IConfiguredHintedElementType {
 
@@ -50,7 +50,7 @@ public class ConfiguredHintedMetamodelElementType extends MetamodelType implemen
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType#getConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.IConfiguredHintedElementType#getConfiguration()
 	 *
 	 * @return
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedSpecializationElementType.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredHintedSpecializationElementType.java
index a8cc5bec426..58d4818e7e9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfiguredHintedSpecializationElementType.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/ConfiguredHintedSpecializationElementType.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.core.impl;
 
 import java.net.URL;
 
@@ -19,9 +19,9 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.SpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.IConfiguredHintedElementType;
 
 
 public class ConfiguredHintedSpecializationElementType extends SpecializationType implements IConfiguredHintedElementType {
@@ -64,7 +64,7 @@ public class ConfiguredHintedSpecializationElementType extends SpecializationTyp
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredHintedElementType#getConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.IConfiguredHintedElementType#getConfiguration()
 	 *
 	 * @return
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/NullEditHelperAdvice.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java
index 683eae021cc..944ba6058f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/NullEditHelperAdvice.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/impl/NullEditHelperAdvice.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;

+package org.eclipse.papyrus.infra.types.core.impl;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/AbstractNotifierEditHelper.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/AbstractNotifierEditHelper.java
index 3c18e5d84f5..0a030fda643 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/AbstractNotifierEditHelper.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/AbstractNotifierEditHelper.java
@@ -1,258 +1,258 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceApprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceDisapprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdvicePhase;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.AdviceRequestConfigurationEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperApprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperDisapprovedEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.EditHelperRequestConfigurationEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.ExecutableEditHelperEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IdentityEditHelperEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableAdviceEvent;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.UnexecutableEditHelperEvent;
-
-/**
- * An override of the {@link AbstractEditHelper} to provide Notifications during edithelper execution.
- * The notifications provide EditHelper trace information for testing and debugging purpose.
- */
-public abstract class AbstractNotifierEditHelper extends AbstractEditHelper {
-
-	/**
-	 * 
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param req
-	 * @return
-	 */
-	@Override
-	public ICommand getEditCommand(IEditCommandRequest req) {
-		ElementTypesConfigurationsEventsChain eventsChain = new ElementTypesConfigurationsEventsChain(this, req);
-		// Get the matching edit helper advice
-		IEditHelperAdvice[] advice = getEditHelperAdvice(req);
-		// Consult advisors to allow them to configure the request
-		configureRequest(req, advice, eventsChain);
-		// Consult advisors to allow them approve the request
-		boolean approved = approveRequest(req, advice, eventsChain);
-		if (!approved) {
-			// Notify listeners
-			if (Platform.inDebugMode()) {
-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);
-			}
-			return null;
-		}
-		ICommand result = getEditCommand(req, advice, eventsChain);
-		if (result != null) {
-			// Notify listeners
-			if (Platform.inDebugMode()) {
-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);
-			}
-			return result.reduce();
-		}
-		// Notify listeners
-		if (Platform.inDebugMode()) {
-			ElementTypesConfigurationsListenersRegistry.getInstance().notifyChain(eventsChain);
-		}
-		return result;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(IEditCommandRequest, IEditHelperAdvice[])
-	 * 
-	 * @param req
-	 * @param advice
-	 * @param eventsChain
-	 * @return
-	 */
-	private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {
-		ICompositeCommand command = createCommand(req);
-		// Get 'before' commands from matching element type
-		// specializations
-		if (advice != null) {
-			for (int i = 0; i < advice.length; i++) {
-				IEditHelperAdvice nextAdvice = advice[i];
-				// Before commands
-				ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);
-				if (beforeAdvice != null) {
-					if (beforeAdvice.canExecute()) {
-						if (Platform.inDebugMode()) {
-							if (beforeAdvice.equals(IdentityCommand.INSTANCE)) {
-								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.before);
-								eventsChain.addBeforeAdvicesCommandsEvent(event);
-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-							} else {
-								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);
-								eventsChain.addBeforeAdvicesCommandsEvent(event);
-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-							}
-						}
-						command.compose(beforeAdvice);
-					} else {
-						if (Platform.inDebugMode()) {
-							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);
-							eventsChain.addBeforeAdvicesCommandsEvent(event);
-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-						}
-						return beforeAdvice;
-					}
-				}
-			}
-		}
-		// Check if the parameter has been set to ignore the default edit command.
-		Object replaceParam = req.getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);
-		if (replaceParam != Boolean.TRUE) {
-			// Get 'instead' command from this edit helper
-			ICommand insteadCommand = getInsteadCommand(req);
-			if (insteadCommand != null) {
-				if (insteadCommand.canExecute()) {
-					if (Platform.inDebugMode()) {
-						if (insteadCommand.equals(IdentityCommand.INSTANCE)) {
-							IdentityEditHelperEvent event = new IdentityEditHelperEvent(req, this);
-							eventsChain.setEditHelperCommandEvent(event);
-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-						} else {
-							ExecutableEditHelperEvent event = new ExecutableEditHelperEvent(req, this, insteadCommand);
-							eventsChain.setEditHelperCommandEvent(event);
-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-						}
-					}
-					command.compose(insteadCommand);
-				} else {
-					if (Platform.inDebugMode()) {
-						UnexecutableEditHelperEvent event = new UnexecutableEditHelperEvent(req, this, insteadCommand);
-						eventsChain.setEditHelperCommandEvent(event);
-						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-					}
-					return insteadCommand;
-				}
-			}
-		}
-		// Get 'after' commands from matching element type
-		// specializations
-		if (advice != null) {
-			for (int i = 0; i < advice.length; i++) {
-				IEditHelperAdvice nextAdvice = advice[i];
-				// After commands
-				ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);
-				if (afterAdvice != null) {
-					if (afterAdvice.canExecute()) {
-						if (Platform.inDebugMode()) {
-							if (afterAdvice.equals(IdentityCommand.INSTANCE)) {
-								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.after);
-								eventsChain.addBeforeAdvicesCommandsEvent(event);
-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-							} else {
-								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);
-								eventsChain.addBeforeAdvicesCommandsEvent(event);
-								ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-							}
-						}
-						command.compose(afterAdvice);
-					} else {
-						if (Platform.inDebugMode()) {
-							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);
-							eventsChain.addBeforeAdvicesCommandsEvent(event);
-							ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-						}
-						return afterAdvice;
-					}
-				}
-			}
-		}
-		return command.isEmpty() ? null : command;
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#configureRequest(IEditCommandRequest, IEditHelperAdvice[])
-	 * 
-	 * @param req
-	 * @param advice
-	 * @param eventsChain
-	 */
-	private void configureRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {
-		if (advice != null) {
-			for (int i = 0; i < advice.length; i++) {
-				IEditHelperAdvice nextAdvice = advice[i];
-				nextAdvice.configureRequest(req);
-				if (Platform.inDebugMode()) {
-					AdviceRequestConfigurationEvent event = new AdviceRequestConfigurationEvent(req, this, nextAdvice, advice);
-					eventsChain.addAdviceRequestConfigurationEvent(event);
-					ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-				}
-			}
-		}
-		// All advice has configured the request. Now consult this edit helper.
-		configureRequest(req);
-		if (Platform.inDebugMode()) {
-			EditHelperRequestConfigurationEvent event = new EditHelperRequestConfigurationEvent(req, this);
-			eventsChain.setEditHelperRequestConfigurationEvent(event);
-			ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#approveRequest(IEditCommandRequest, IEditHelperAdvice[])
-	 * 
-	 * @param req
-	 * @param advice
-	 * @param eventsChain
-	 * @return
-	 */
-	private boolean approveRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, ElementTypesConfigurationsEventsChain eventsChain) {
-		if (advice != null) {
-			for (int i = 0; i < advice.length; i++) {
-				IEditHelperAdvice nextAdvice = advice[i];
-				boolean approved = nextAdvice.approveRequest(req);
-				if (!approved) {
-					if (Platform.inDebugMode()) {
-						AdviceDisapprovedEvent event = new AdviceDisapprovedEvent(req, this, nextAdvice, advice);
-						eventsChain.addAdviceApprovalEvent(event);
-						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-					}
-					return false;
-				} else {
-					if (Platform.inDebugMode()) {
-						AdviceApprovedEvent event = new AdviceApprovedEvent(req, this, nextAdvice, advice);
-						eventsChain.addAdviceApprovalEvent(event);
-						ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-					}
-				}
-			}
-		}
-		// All advice has approved the request. Now consult this edit helper.
-		boolean approved = approveRequest(req);
-		if (Platform.inDebugMode()) {
-			if (!approved) {
-				EditHelperDisapprovedEvent event = new EditHelperDisapprovedEvent(req, this);
-				eventsChain.setEditHelperApprovalEvent(event);
-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-			} else {
-				EditHelperApprovedEvent event = new EditHelperApprovedEvent(req, this);
-				eventsChain.setEditHelperApprovalEvent(event);
-				ElementTypesConfigurationsListenersRegistry.getInstance().notifyEvent(event);
-			}
-		}
-		return approved;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.common.core.command.IdentityCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdvicePhase;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperRequestEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;

+

+/**

+ * An override of the {@link AbstractEditHelper} to provide Notifications during edithelper execution.

+ * The notifications provide EditHelper trace information for testing and debugging purpose.

+ */

+public abstract class AbstractNotifierEditHelper extends AbstractEditHelper {

+

+	/**

+	 * 

+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

+	 *

+	 * @param req

+	 * @return

+	 */

+	@Override

+	public ICommand getEditCommand(IEditCommandRequest req) {

+		TypesEventsChain eventsChain = new TypesEventsChain(this, req);

+		// Get the matching edit helper advice

+		IEditHelperAdvice[] advice = getEditHelperAdvice(req);

+		// Consult advisors to allow them to configure the request

+		configureRequest(req, advice, eventsChain);

+		// Consult advisors to allow them approve the request

+		boolean approved = approveRequest(req, advice, eventsChain);

+		if (!approved) {

+			// Notify listeners

+			if (Platform.inDebugMode()) {

+				TypesListenersRegistry.getInstance().notifyChain(eventsChain);

+			}

+			return null;

+		}

+		ICommand result = getEditCommand(req, advice, eventsChain);

+		if (result != null) {

+			// Notify listeners

+			if (Platform.inDebugMode()) {

+				TypesListenersRegistry.getInstance().notifyChain(eventsChain);

+			}

+			return result.reduce();

+		}

+		// Notify listeners

+		if (Platform.inDebugMode()) {

+			TypesListenersRegistry.getInstance().notifyChain(eventsChain);

+		}

+		return result;

+	}

+

+	/**

+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#getEditCommand(IEditCommandRequest, IEditHelperAdvice[])

+	 * 

+	 * @param req

+	 * @param advice

+	 * @param eventsChain

+	 * @return

+	 */

+	private ICommand getEditCommand(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {

+		ICompositeCommand command = createCommand(req);

+		// Get 'before' commands from matching element type

+		// specializations

+		if (advice != null) {

+			for (int i = 0; i < advice.length; i++) {

+				IEditHelperAdvice nextAdvice = advice[i];

+				// Before commands

+				ICommand beforeAdvice = nextAdvice.getBeforeEditCommand(req);

+				if (beforeAdvice != null) {

+					if (beforeAdvice.canExecute()) {

+						if (Platform.inDebugMode()) {

+							if (beforeAdvice.equals(IdentityCommand.INSTANCE)) {

+								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.before);

+								eventsChain.addBeforeAdvicesCommandsEvent(event);

+								TypesListenersRegistry.getInstance().notifyEvent(event);

+							} else {

+								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);

+								eventsChain.addBeforeAdvicesCommandsEvent(event);

+								TypesListenersRegistry.getInstance().notifyEvent(event);

+							}

+						}

+						command.compose(beforeAdvice);

+					} else {

+						if (Platform.inDebugMode()) {

+							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, beforeAdvice, advice, AdvicePhase.before);

+							eventsChain.addBeforeAdvicesCommandsEvent(event);

+							TypesListenersRegistry.getInstance().notifyEvent(event);

+						}

+						return beforeAdvice;

+					}

+				}

+			}

+		}

+		// Check if the parameter has been set to ignore the default edit command.

+		Object replaceParam = req.getParameter(IEditCommandRequest.REPLACE_DEFAULT_COMMAND);

+		if (replaceParam != Boolean.TRUE) {

+			// Get 'instead' command from this edit helper

+			ICommand insteadCommand = getInsteadCommand(req);

+			if (insteadCommand != null) {

+				if (insteadCommand.canExecute()) {

+					if (Platform.inDebugMode()) {

+						if (insteadCommand.equals(IdentityCommand.INSTANCE)) {

+							IdentityEditHelperEvent event = new IdentityEditHelperEvent(req, this);

+							eventsChain.setEditHelperCommandEvent(event);

+							TypesListenersRegistry.getInstance().notifyEvent(event);

+						} else {

+							ExecutableEditHelperEvent event = new ExecutableEditHelperEvent(req, this, insteadCommand);

+							eventsChain.setEditHelperCommandEvent(event);

+							TypesListenersRegistry.getInstance().notifyEvent(event);

+						}

+					}

+					command.compose(insteadCommand);

+				} else {

+					if (Platform.inDebugMode()) {

+						UnexecutableEditHelperEvent event = new UnexecutableEditHelperEvent(req, this, insteadCommand);

+						eventsChain.setEditHelperCommandEvent(event);

+						TypesListenersRegistry.getInstance().notifyEvent(event);

+					}

+					return insteadCommand;

+				}

+			}

+		}

+		// Get 'after' commands from matching element type

+		// specializations

+		if (advice != null) {

+			for (int i = 0; i < advice.length; i++) {

+				IEditHelperAdvice nextAdvice = advice[i];

+				// After commands

+				ICommand afterAdvice = nextAdvice.getAfterEditCommand(req);

+				if (afterAdvice != null) {

+					if (afterAdvice.canExecute()) {

+						if (Platform.inDebugMode()) {

+							if (afterAdvice.equals(IdentityCommand.INSTANCE)) {

+								IdentityAdviceEvent event = new IdentityAdviceEvent(req, this, nextAdvice, advice, AdvicePhase.after);

+								eventsChain.addBeforeAdvicesCommandsEvent(event);

+								TypesListenersRegistry.getInstance().notifyEvent(event);

+							} else {

+								ExecutableAdviceEvent event = new ExecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);

+								eventsChain.addBeforeAdvicesCommandsEvent(event);

+								TypesListenersRegistry.getInstance().notifyEvent(event);

+							}

+						}

+						command.compose(afterAdvice);

+					} else {

+						if (Platform.inDebugMode()) {

+							UnexecutableAdviceEvent event = new UnexecutableAdviceEvent(req, this, nextAdvice, afterAdvice, advice, AdvicePhase.after);

+							eventsChain.addBeforeAdvicesCommandsEvent(event);

+							TypesListenersRegistry.getInstance().notifyEvent(event);

+						}

+						return afterAdvice;

+					}

+				}

+			}

+		}

+		return command.isEmpty() ? null : command;

+	}

+

+	/**

+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#configureRequest(IEditCommandRequest, IEditHelperAdvice[])

+	 * 

+	 * @param req

+	 * @param advice

+	 * @param eventsChain

+	 */

+	private void configureRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {

+		if (advice != null) {

+			for (int i = 0; i < advice.length; i++) {

+				IEditHelperAdvice nextAdvice = advice[i];

+				nextAdvice.configureRequest(req);

+				if (Platform.inDebugMode()) {

+					AdviceRequestEvent event = new AdviceRequestEvent(req, this, nextAdvice, advice);

+					eventsChain.addAdviceRequestConfigurationEvent(event);

+					TypesListenersRegistry.getInstance().notifyEvent(event);

+				}

+			}

+		}

+		// All advice has configured the request. Now consult this edit helper.

+		configureRequest(req);

+		if (Platform.inDebugMode()) {

+			EditHelperRequestEvent event = new EditHelperRequestEvent(req, this);

+			eventsChain.setEditHelperRequestConfigurationEvent(event);

+			TypesListenersRegistry.getInstance().notifyEvent(event);

+		}

+	}

+

+	/**

+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper#approveRequest(IEditCommandRequest, IEditHelperAdvice[])

+	 * 

+	 * @param req

+	 * @param advice

+	 * @param eventsChain

+	 * @return

+	 */

+	private boolean approveRequest(IEditCommandRequest req, IEditHelperAdvice[] advice, TypesEventsChain eventsChain) {

+		if (advice != null) {

+			for (int i = 0; i < advice.length; i++) {

+				IEditHelperAdvice nextAdvice = advice[i];

+				boolean approved = nextAdvice.approveRequest(req);

+				if (!approved) {

+					if (Platform.inDebugMode()) {

+						AdviceDisapprovedEvent event = new AdviceDisapprovedEvent(req, this, nextAdvice, advice);

+						eventsChain.addAdviceApprovalEvent(event);

+						TypesListenersRegistry.getInstance().notifyEvent(event);

+					}

+					return false;

+				} else {

+					if (Platform.inDebugMode()) {

+						AdviceApprovedEvent event = new AdviceApprovedEvent(req, this, nextAdvice, advice);

+						eventsChain.addAdviceApprovalEvent(event);

+						TypesListenersRegistry.getInstance().notifyEvent(event);

+					}

+				}

+			}

+		}

+		// All advice has approved the request. Now consult this edit helper.

+		boolean approved = approveRequest(req);

+		if (Platform.inDebugMode()) {

+			if (!approved) {

+				EditHelperDisapprovedEvent event = new EditHelperDisapprovedEvent(req, this);

+				eventsChain.setEditHelperApprovalEvent(event);

+				TypesListenersRegistry.getInstance().notifyEvent(event);

+			} else {

+				EditHelperApprovedEvent event = new EditHelperApprovedEvent(req, this);

+				eventsChain.setEditHelperApprovalEvent(event);

+				TypesListenersRegistry.getInstance().notifyEvent(event);

+			}

+		}

+		return approved;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsChainListener.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsChainListener.java
index f5f5db57b93..a149575e756 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsChainListener.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsChainListener.java
@@ -1,21 +1,21 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
-
-/**
- * Interface to implemented by listeners that want to be notified of {@link ElementTypesConfigurationsEventsChain}
- */
-public interface IElementTypesConfigurationsEventsChainListener {
-
-	public void notifyChain(ElementTypesConfigurationsEventsChain chain);
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification;

+

+/**

+ * Interface to implemented by listeners that want to be notified of {@link TypesEventsChain}

+ */

+public interface ITypesEventsChainListener {

+

+	public void notifyChain(TypesEventsChain chain);

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsListener.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsListener.java
index d363b0935b3..5dbbb5ab15b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/IElementTypesConfigurationsEventsListener.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/ITypesEventsListener.java
@@ -1,23 +1,20 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent;
-
-/**
- * Interface to implemented by listeners that want to be notified of {@link IElementTypesConfigurationsEvent}
- */
-public interface IElementTypesConfigurationsEventsListener {
-
-	public void notifyEvent(IElementTypesConfigurationsEvent event);
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification;

+

+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

+

+public interface ITypesEventsListener {

+

+	public void notifyEvent(ITypesEvent event);

+}

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java
new file mode 100644
index 00000000000..1743aa3632d
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesEventsChain.java
@@ -0,0 +1,245 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.types.core.notification.events.AbstractTypesEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceApprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceDisapprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.AdviceRequestEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperApprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.EditHelperDisapprovedEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.ExecutableEditHelperEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.IdentityEditHelperEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableAdviceEvent;

+import org.eclipse.papyrus.infra.types.core.notification.events.UnexecutableEditHelperEvent;

+

+public class TypesEventsChain {

+

+	/**

+	 * Timestamp of the creation of the chain

+	 */

+	private long timestamp;

+

+	/**

+	 * The {@link IEditHelper} that triggered the {@link TypesEventsChain}

+	 */

+	private IEditHelper editHelper;

+

+	/**

+	 * The {@link IEditCommandRequest} that triggered the {@link TypesEventsChain}

+	 */

+	private IEditCommandRequest req;

+

+	TypesEventsChain(IEditHelper editHelper, IEditCommandRequest req) {

+		timestamp = System.currentTimeMillis();

+		this.editHelper = editHelper;

+		this.req = req;

+	}

+

+	/**

+	 * The various categories of events that occur during the execution of the {@link IEditHelper}

+	 */

+	private List<AbstractTypesEvent> adviceRequestConfigurationEvents = new ArrayList<AbstractTypesEvent>();

+

+	private AbstractTypesEvent editHelperRequestConfigurationEvent = null;

+

+	private List<AbstractTypesEvent> adviceApprovalEvents = new ArrayList<AbstractTypesEvent>();

+

+	private AbstractTypesEvent editHelperApprovalEvent = null;

+

+	private List<AbstractTypesEvent> beforeAdvicesCommandsEvents = new ArrayList<AbstractTypesEvent>();

+

+	private List<AbstractTypesEvent> afterAdvicesCommandsEvents = new ArrayList<AbstractTypesEvent>();

+

+	private AbstractTypesEvent editHelperCommandEvent = null;

+

+	/**

+	 * @return the adviceApprovalEvents

+	 */

+	public List<AbstractTypesEvent> getAdviceApprovalEvents() {

+		return adviceApprovalEvents;

+	}

+

+	/**

+	 * Add a {@link AdviceDisapprovedEvent} or {@link AdviceApprovedEvent} event

+	 * 

+	 * @param adviceApprovalEvent

+	 */

+	public void addAdviceApprovalEvent(AbstractTypesEvent adviceApprovalEvent) {

+		if (adviceApprovalEvent instanceof AdviceDisapprovedEvent || adviceApprovalEvent instanceof AdviceApprovedEvent) {

+			adviceApprovalEvents.add(adviceApprovalEvent);

+		}

+	}

+

+	/**

+	 * @return the editHelperAprrovalEvent

+	 */

+	public AbstractTypesEvent getEditHelperApprovalEvent() {

+		return editHelperApprovalEvent;

+	}

+

+	/**

+	 * @param editHelperAprrovalEvent

+	 *            the editHelperAprrovalEvent to set

+	 */

+	public void setEditHelperApprovalEvent(AbstractTypesEvent editHelperApprovalEvent) {

+		if (editHelperApprovalEvent instanceof EditHelperDisapprovedEvent || editHelperApprovalEvent instanceof EditHelperApprovedEvent) {

+			this.editHelperApprovalEvent = editHelperApprovalEvent;

+		}

+	}

+

+	/**

+	 * @return the beforeAdvicesCommandsEvents

+	 */

+	public List<AbstractTypesEvent> getBeforeAdvicesCommandsEvents() {

+		return beforeAdvicesCommandsEvents;

+	}

+

+	/**

+	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event

+	 * 

+	 * @param beforeAdvicesCommandsEvents

+	 *            the beforeAdvicesCommandsEvents to set

+	 */

+	public void addBeforeAdvicesCommandsEvent(AbstractTypesEvent beforeAdvicesCommandEvent) {

+		if (beforeAdvicesCommandEvent instanceof ExecutableAdviceEvent || beforeAdvicesCommandEvent instanceof UnexecutableAdviceEvent || beforeAdvicesCommandEvent instanceof IdentityAdviceEvent) {

+			beforeAdvicesCommandsEvents.add(beforeAdvicesCommandEvent);

+		}

+	}

+

+	/**

+	 * @return the afterAdvicesCommandsEvents

+	 */

+	public List<AbstractTypesEvent> getAfterAdvicesCommandsEvents() {

+		return afterAdvicesCommandsEvents;

+	}

+

+	/**

+	 * Add a {@link ExecutableAdviceEvent}, {@link UnexecutableAdviceEvent} or {@link IdentityAdviceEvent} event

+	 * 

+	 * @param afterAdvicesCommandEvent

+	 */

+	public void addAfterAdvicesCommandsEvent(AbstractTypesEvent afterAdvicesCommandEvent) {

+		if (afterAdvicesCommandEvent instanceof ExecutableAdviceEvent || afterAdvicesCommandEvent instanceof UnexecutableAdviceEvent || afterAdvicesCommandEvent instanceof IdentityAdviceEvent) {

+			afterAdvicesCommandsEvents.add(afterAdvicesCommandEvent);

+		}

+	}

+

+	/**

+	 * @return the editHelperCommandEvent

+	 */

+	public AbstractTypesEvent getEditHelperCommandEvent() {

+		return editHelperCommandEvent;

+	}

+

+	/**

+	 * @param editHelperCommandEvent

+	 *            the editHelperCommandEvent to set ({@link ExecutableEditHelperEvent}, {@link UnexecutableEditHelperEvent} or

+	 *            {@link IdentityEditHelperEvent})

+	 */

+	public void setEditHelperCommandEvent(AbstractTypesEvent editHelperCommandEvent) {

+		if (editHelperCommandEvent instanceof ExecutableEditHelperEvent || editHelperCommandEvent instanceof UnexecutableEditHelperEvent || editHelperCommandEvent instanceof IdentityEditHelperEvent) {

+			this.editHelperCommandEvent = editHelperCommandEvent;

+		}

+	}

+

+	/**

+	 * Returns all the events that occurred during the execution of the {@link IEditHelper} (i.e. all events categories)

+	 * 

+	 * @return

+	 */

+	public List<AbstractTypesEvent> getAllEvents() {

+		List<AbstractTypesEvent> result = new ArrayList<AbstractTypesEvent>();

+		if (!adviceRequestConfigurationEvents.isEmpty()) {

+			result.addAll(adviceRequestConfigurationEvents);

+		}

+		if (editHelperRequestConfigurationEvent != null) {

+			result.add(editHelperRequestConfigurationEvent);

+		}

+		if (!adviceApprovalEvents.isEmpty()) {

+			result.addAll(adviceApprovalEvents);

+		}

+		if (editHelperApprovalEvent != null) {

+			result.add(editHelperApprovalEvent);

+		}

+		if (!beforeAdvicesCommandsEvents.isEmpty()) {

+			result.addAll(beforeAdvicesCommandsEvents);

+		}

+		if (editHelperCommandEvent != null) {

+			result.add(editHelperCommandEvent);

+		}

+		if (!afterAdvicesCommandsEvents.isEmpty()) {

+			result.addAll(afterAdvicesCommandsEvents);

+		}

+		return result;

+	}

+

+	/**

+	 * @return the timestamp creation of this {@link TypesEventsChain}

+	 */

+	public long getTimestamp() {

+		return timestamp;

+	}

+

+	/**

+	 * @return the req

+	 */

+	public IEditCommandRequest getRequest() {

+		return req;

+	}

+

+	/**

+	 * The Simple Name of the class of the {@link IEditHelper} that triggered this {@link TypesEventsChain}

+	 * 

+	 * @return

+	 */

+	public String getName() {

+		return editHelper.getClass().getSimpleName();

+	}

+

+	/**

+	 * @return the adviceRequestConfigurationEvents

+	 */

+	public List<AbstractTypesEvent> getAdviceRequestConfigurationEvents() {

+		return adviceRequestConfigurationEvents;

+	}

+

+	/**

+	 * @param adviceConfigureEvent

+	 */

+	public void addAdviceRequestConfigurationEvent(AdviceRequestEvent adviceConfigureEvent) {

+		adviceRequestConfigurationEvents.add(adviceConfigureEvent);

+	}

+

+	/**

+	 * @return the editHelperRequestConfigurationEvent

+	 */

+	public AbstractTypesEvent getEditHelperRequestConfigurationEvent() {

+		return editHelperRequestConfigurationEvent;

+	}

+

+	/**

+	 * @param editHelperRequestConfigurationEvent

+	 *            the editHelperRequestConfigurationEvent to set

+	 */

+	public void setEditHelperRequestConfigurationEvent(AbstractTypesEvent editHelperRequestConfigurationEvent) {

+		this.editHelperRequestConfigurationEvent = editHelperRequestConfigurationEvent;

+	}

+}

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java
new file mode 100644
index 00000000000..e27face6403
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/TypesListenersRegistry.java
@@ -0,0 +1,74 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification;

+

+import java.util.HashSet;

+import java.util.Set;

+

+import org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent;

+

+/**

+ * Singleton used to register eventsChains listeners ({@link ITypesEventsChainListener})

+ */

+public class TypesListenersRegistry {

+

+	private static Set<ITypesEventsChainListener> eventChainListeners = null;

+

+	private static Set<ITypesEventsListener> eventListeners = null;

+

+	private static TypesListenersRegistry instance = null;

+

+	private TypesListenersRegistry() {

+	}

+

+	public static synchronized TypesListenersRegistry getInstance() {

+		if (instance == null) {

+			instance = new TypesListenersRegistry();

+			init();

+		}

+		return instance;

+	}

+

+	public static void init() {

+		eventChainListeners = new HashSet<ITypesEventsChainListener>();

+		eventListeners = new HashSet<ITypesEventsListener>();

+	}

+

+	public void addEventChainListener(ITypesEventsChainListener listener) {

+		eventChainListeners.add(listener);

+	}

+

+	public void removeEventChainListener(ITypesEventsChainListener listener) {

+		eventChainListeners.remove(listener);

+	}

+

+	public void addEventListener(ITypesEventsListener listener) {

+		eventListeners.add(listener);

+	}

+

+	public void removeEventChainListener(ITypesEventsListener listener) {

+		eventListeners.remove(listener);

+	}

+

+	public void notifyChain(TypesEventsChain chain) {

+		for (ITypesEventsChainListener eventsChainListener : eventChainListeners) {

+			eventsChainListener.notifyChain(chain);

+		}

+	}

+

+	public void notifyEvent(ITypesEvent event) {

+		for (ITypesEventsListener eventsListener : eventListeners) {

+			eventsListener.notifyEvent(event);

+		}

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractApprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractApprovedEvent.java
index 54497eadf9d..c651ef40cad 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractApprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractApprovedEvent.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractApprovedEvent extends AbstractElementTypesConfigurationsEvent {
-
-	public AbstractApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
-	 *
-	 * @return
-	 */
-	@Override
-	public ElementTypesConfigurationsEventType getEventType() {
-		return ElementTypesConfigurationsEventType.Approved;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractApprovedEvent extends AbstractTypesEvent {

+

+	public AbstractApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

+	 *

+	 * @return

+	 */

+	@Override

+	public TypesEventKind getEventType() {

+		return TypesEventKind.Approved;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractDisapprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractDisapprovedEvent.java
index c97e942ddbf..a535db4dcd4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractDisapprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractDisapprovedEvent.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractDisapprovedEvent extends AbstractElementTypesConfigurationsEvent {
-
-	public AbstractDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
-	 *
-	 * @return
-	 */
-	@Override
-	public ElementTypesConfigurationsEventType getEventType() {
-		return ElementTypesConfigurationsEventType.Disapproved;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractDisapprovedEvent extends AbstractTypesEvent {

+

+	public AbstractDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

+	 *

+	 * @return

+	 */

+	@Override

+	public TypesEventKind getEventType() {

+		return TypesEventKind.Disapproved;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractExecutableEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractExecutableEvent.java
index ff511f06d54..a1b2fb6fd8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractExecutableEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractExecutableEvent.java
@@ -1,45 +1,46 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractExecutableEvent extends AbstractElementTypesConfigurationsEvent {
-
-	private ICommand command;
-
-
-	public AbstractExecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
-		super(req, editHelper);
-		this.command = command;
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
-	 *
-	 * @return
-	 */
-	@Override
-	public ElementTypesConfigurationsEventType getEventType() {
-		return ElementTypesConfigurationsEventType.Executable;
-	}
-
-	/**
-	 * @return the command
-	 */
-	public ICommand getCommand() {
-		return command;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractExecutableEvent extends AbstractTypesEvent {

+

+	private ICommand command;

+

+

+	public AbstractExecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

+		super(req, editHelper);

+		this.command = command;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

+	 *

+	 * @return

+	 */

+	@Override

+	public TypesEventKind getEventType() {

+		return TypesEventKind.Executable;

+	}

+

+	/**

+	 * @return the command

+	 */

+	public ICommand getCommand() {

+		return command;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractIdentityEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractIdentityEvent.java
index 462db0338b6..2042399d0bc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractIdentityEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractIdentityEvent.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractIdentityEvent extends AbstractElementTypesConfigurationsEvent {
-
-	public AbstractIdentityEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
-	 *
-	 * @return
-	 */
-	@Override
-	public ElementTypesConfigurationsEventType getEventType() {
-		return ElementTypesConfigurationsEventType.Identity;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractIdentityEvent extends AbstractTypesEvent {

+

+	public AbstractIdentityEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

+	 *

+	 * @return

+	 */

+	@Override

+	public TypesEventKind getEventType() {

+		return TypesEventKind.Identity;

+	}

+}

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java
new file mode 100644
index 00000000000..4f3ef2055b3
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractRequestEvent.java
@@ -0,0 +1,34 @@
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractRequestEvent extends AbstractTypesEvent {

+

+	public AbstractRequestEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

+	 *

+	 * @return

+	 */

+	@Override

+	public TypesEventKind getEventType() {

+		return TypesEventKind.RequestConfiguration;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractElementTypesConfigurationsEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractTypesEvent.java
index 97b2e37c735..89d2bcc28e5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractElementTypesConfigurationsEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractTypesEvent.java
@@ -1,75 +1,77 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractElementTypesConfigurationsEvent implements IElementTypesConfigurationsEvent {
-
-	/**
-	 * Timestamp of the creation of this event
-	 */
-	private long timestamp;
-
-	/**
-	 * The {@link IEditCommandRequest} that triggered this {@link IElementTypesConfigurationsEvent}
-	 */
-	private IEditCommandRequest request;
-
-	private IEditHelper editHelper;
-
-	public AbstractElementTypesConfigurationsEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		this();
-		this.request = req;
-		this.editHelper = editHelper;
-	}
-
-	/**
-	 * @return the {@link IEditCommandRequest} that triggered the event
-	 */
-	public IEditCommandRequest getRequest() {
-		return request;
-	}
-
-	/**
-	 * @return the {@link IEditHelper} that triggered the event
-	 */
-	public IEditHelper getEditHelper() {
-		return editHelper;
-	}
-
-	AbstractElementTypesConfigurationsEvent() {
-		timestamp = System.currentTimeMillis();
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getTimestamp()
-	 *
-	 * @return
-	 */
-	@Override
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventName()
-	 *
-	 * @return
-	 */
-	@Override
-	public String getEventName() {
-		return this.getClass().getSimpleName();
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractTypesEvent implements ITypesEvent {

+

+	/**

+	 * Timestamp of the creation of this event

+	 */

+	private long timestamp;

+

+	/**

+	 * The {@link IEditCommandRequest} that triggered this {@link ITypesEvent}

+	 */

+	private IEditCommandRequest request;

+

+	private IEditHelper editHelper;

+

+	public AbstractTypesEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		this();

+		this.request = req;

+		this.editHelper = editHelper;

+	}

+

+	/**

+	 * @return the {@link IEditCommandRequest} that triggered the event

+	 */

+	public IEditCommandRequest getRequest() {

+		return request;

+	}

+

+	/**

+	 * @return the {@link IEditHelper} that triggered the event

+	 */

+	public IEditHelper getEditHelper() {

+		return editHelper;

+	}

+

+	AbstractTypesEvent() {

+		timestamp = System.currentTimeMillis();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getTimestamp()

+	 *

+	 * @return

+	 */

+	@Override

+	public long getTimestamp() {

+		return timestamp;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventName()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getEventName() {

+		return this.getClass().getSimpleName();

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractUnexecutableEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractUnexecutableEvent.java
index 64271bacfe8..b80125a14db 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AbstractUnexecutableEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AbstractUnexecutableEvent.java
@@ -1,47 +1,48 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public abstract class AbstractUnexecutableEvent extends AbstractElementTypesConfigurationsEvent {
-
-	public AbstractUnexecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
-		super(req, editHelper);
-		this.command = command;
-	}
-
-	/**
-	 * @return the command
-	 */
-	public ICommand getCommand() {
-		return command;
-	}
-
-	private ICommand command;
-
-
-
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IElementTypesConfigurationsEvent#getEventType()
-	 *
-	 * @return
-	 */
-	@Override
-	public ElementTypesConfigurationsEventType getEventType() {
-		return ElementTypesConfigurationsEventType.Unexecutable;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public abstract class AbstractUnexecutableEvent extends AbstractTypesEvent {

+

+	public AbstractUnexecutableEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

+		super(req, editHelper);

+		this.command = command;

+	}

+

+	/**

+	 * @return the command

+	 */

+	public ICommand getCommand() {

+		return command;

+	}

+

+	private ICommand command;

+

+

+

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.core.notification.events.ITypesEvent#getEventType()

+	 *

+	 * @return

+	 */

+	@Override

+	public TypesEventKind getEventType() {

+		return TypesEventKind.Unexecutable;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceApprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceApprovedEvent.java
index dbb7cee41a2..031a6c45e21 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceApprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceApprovedEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class AdviceApprovedEvent extends AbstractApprovedEvent implements IAdviceEvent {
-
-	private IEditHelperAdvice advice;
-
-	private IEditHelperAdvice[] advices;
-
-	public AdviceApprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {
-		super(req, editHelper);
-		this.advice = nextAdvice;
-		this.advices = advices;
-	}
-
-	/**
-	 * @return the advice
-	 */
-	@Override
-	public IEditHelperAdvice getAdvice() {
-		return advice;
-	}
-
-	/**
-	 * @return the advices
-	 */
-	@Override
-	public IEditHelperAdvice[] getAdvices() {
-		return advices;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class AdviceApprovedEvent extends AbstractApprovedEvent implements IAdviceEvent {

+

+	private IEditHelperAdvice advice;

+

+	private IEditHelperAdvice[] advices;

+

+	public AdviceApprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {

+		super(req, editHelper);

+		this.advice = nextAdvice;

+		this.advices = advices;

+	}

+

+	/**

+	 * @return the advice

+	 */

+	@Override

+	public IEditHelperAdvice getAdvice() {

+		return advice;

+	}

+

+	/**

+	 * @return the advices

+	 */

+	@Override

+	public IEditHelperAdvice[] getAdvices() {

+		return advices;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceDisapprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceDisapprovedEvent.java
index edc98e1cdbf..6dc87187828 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceDisapprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceDisapprovedEvent.java
@@ -1,46 +1,46 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class AdviceDisapprovedEvent extends AbstractDisapprovedEvent implements IAdviceEvent {
-
-	private IEditHelperAdvice advice;
-
-	IEditHelperAdvice[] advices;
-
-	/**
-	 * @return the advice
-	 */
-	@Override
-	public IEditHelperAdvice getAdvice() {
-		return advice;
-	}
-
-	/**
-	 * @return the advices
-	 */
-	@Override
-	public IEditHelperAdvice[] getAdvices() {
-		return advices;
-	}
-
-	public AdviceDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {
-		super(req, editHelper);
-		this.advice = nextAdvice;
-		this.advices = advices;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class AdviceDisapprovedEvent extends AbstractDisapprovedEvent implements IAdviceEvent {

+

+	private IEditHelperAdvice advice;

+

+	IEditHelperAdvice[] advices;

+

+	/**

+	 * @return the advice

+	 */

+	@Override

+	public IEditHelperAdvice getAdvice() {

+		return advice;

+	}

+

+	/**

+	 * @return the advices

+	 */

+	@Override

+	public IEditHelperAdvice[] getAdvices() {

+		return advices;

+	}

+

+	public AdviceDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice nextAdvice, IEditHelperAdvice[] advices) {

+		super(req, editHelper);

+		this.advice = nextAdvice;

+		this.advices = advices;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdvicePhase.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdvicePhase.java
index b251d2863b0..cee10473d8a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdvicePhase.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdvicePhase.java
@@ -1,17 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-public enum AdvicePhase {
-	before, after
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+public enum AdvicePhase {

+	before, after

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceRequestConfigurationEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceRequestEvent.java
index 9cf18f699c7..f83e1ebcd36 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/AdviceRequestConfigurationEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/AdviceRequestEvent.java
@@ -1,50 +1,50 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class AdviceRequestConfigurationEvent extends AbstractRequestConfigurationEvent implements IAdviceEvent {
-
-	private IEditHelperAdvice advice;
-
-	private IEditHelperAdvice[] advices;
-
-	public AdviceRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices) {
-		super(req, editHelper);
-		this.advice = advice;
-		this.advices = advices;
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent#getAdvice()
-	 *
-	 * @return
-	 */
-	@Override
-	public IEditHelperAdvice getAdvice() {
-		return advice;
-	}
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events.IAdviceEvent#getAdvices()
-	 *
-	 * @return
-	 */
-	@Override
-	public IEditHelperAdvice[] getAdvices() {
-		return advices;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class AdviceRequestEvent extends AbstractRequestEvent implements IAdviceEvent {

+

+	private IEditHelperAdvice advice;

+

+	private IEditHelperAdvice[] advices;

+

+	public AdviceRequestEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices) {

+		super(req, editHelper);

+		this.advice = advice;

+		this.advices = advices;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.types.notification.events.IAdviceEvent#getAdvice()

+	 *

+	 * @return

+	 */

+	@Override

+	public IEditHelperAdvice getAdvice() {

+		return advice;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.types.notification.events.IAdviceEvent#getAdvices()

+	 *

+	 * @return

+	 */

+	@Override

+	public IEditHelperAdvice[] getAdvices() {

+		return advices;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperApprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperApprovedEvent.java
index e49b485d8c6..de929f2a089 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperApprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperApprovedEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class EditHelperApprovedEvent extends AbstractApprovedEvent {
-
-	public EditHelperApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class EditHelperApprovedEvent extends AbstractApprovedEvent {

+

+	public EditHelperApprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperDisapprovedEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperDisapprovedEvent.java
index 149ee0c901d..3f736c2b299 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperDisapprovedEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperDisapprovedEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *   
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class EditHelperDisapprovedEvent extends AbstractDisapprovedEvent {
-
-	public EditHelperDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class EditHelperDisapprovedEvent extends AbstractDisapprovedEvent {

+

+	public EditHelperDisapprovedEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperRequestConfigurationEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperRequestEvent.java
index e6c66afc27d..2ab1cd9a095 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/EditHelperRequestConfigurationEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/EditHelperRequestEvent.java
@@ -1,23 +1,23 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class EditHelperRequestConfigurationEvent extends AbstractRequestConfigurationEvent {
-
-	public EditHelperRequestConfigurationEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class EditHelperRequestEvent extends AbstractRequestEvent {

+

+	public EditHelperRequestEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableAdviceEvent.java
index 97a98903269..e36c736393f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableAdviceEvent.java
@@ -1,57 +1,57 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class ExecutableAdviceEvent extends AbstractExecutableEvent implements IAdviceEvent {
-
-	private IEditHelperAdvice advice;
-
-	private IEditHelperAdvice[] advices;
-
-	private AdvicePhase advicePhase;
-
-	public ExecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
-		super(req, editHelper, command);
-		this.advice = advice;
-		this.advices = advices;
-		this.advicePhase = advicePhase;
-	}
-
-	/**
-	 * @return the advice
-	 */
-	@Override
-	public IEditHelperAdvice getAdvice() {
-		return advice;
-	}
-
-	/**
-	 * @return the advices
-	 */
-	@Override
-	public IEditHelperAdvice[] getAdvices() {
-		return advices;
-	}
-
-	/**
-	 * @return the advicePhase
-	 */
-	public AdvicePhase getAdvicePhase() {
-		return advicePhase;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class ExecutableAdviceEvent extends AbstractExecutableEvent implements IAdviceEvent {

+

+	private IEditHelperAdvice advice;

+

+	private IEditHelperAdvice[] advices;

+

+	private AdvicePhase advicePhase;

+

+	public ExecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

+		super(req, editHelper, command);

+		this.advice = advice;

+		this.advices = advices;

+		this.advicePhase = advicePhase;

+	}

+

+	/**

+	 * @return the advice

+	 */

+	@Override

+	public IEditHelperAdvice getAdvice() {

+		return advice;

+	}

+

+	/**

+	 * @return the advices

+	 */

+	@Override

+	public IEditHelperAdvice[] getAdvices() {

+		return advices;

+	}

+

+	/**

+	 * @return the advicePhase

+	 */

+	public AdvicePhase getAdvicePhase() {

+		return advicePhase;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableEditHelperEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableEditHelperEvent.java
index f998e9145e3..28736d0503d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ExecutableEditHelperEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ExecutableEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class ExecutableEditHelperEvent extends AbstractExecutableEvent {
-
-	public ExecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
-		super(req, editHelper, command);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class ExecutableEditHelperEvent extends AbstractExecutableEvent {

+

+	public ExecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

+		super(req, editHelper, command);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IAdviceEvent.java
index 58ef81a93da..e4c1c07caec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IAdviceEvent.java
@@ -1,28 +1,28 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-
-public interface IAdviceEvent extends IElementTypesConfigurationsEvent {
-
-	/**
-	 * @return the advice
-	 */
-	public IEditHelperAdvice getAdvice();
-
-	/**
-	 * @return the advices
-	 */
-	public IEditHelperAdvice[] getAdvices();
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+

+public interface IAdviceEvent extends ITypesEvent {

+

+	/**

+	 * @return the advice

+	 */

+	public IEditHelperAdvice getAdvice();

+

+	/**

+	 * @return the advices

+	 */

+	public IEditHelperAdvice[] getAdvices();

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IElementTypesConfigurationsEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ITypesEvent.java
index 5d93ff9cb0d..b72c243279d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IElementTypesConfigurationsEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/ITypesEvent.java
@@ -1,29 +1,29 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public interface IElementTypesConfigurationsEvent {
-
-	public long getTimestamp();
-
-	public String getEventName();
-
-	public ElementTypesConfigurationsEventType getEventType();
-
-	public IEditCommandRequest getRequest();
-
-	public IEditHelper getEditHelper();
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public interface ITypesEvent {

+

+	public long getTimestamp();

+

+	public String getEventName();

+

+	public TypesEventKind getEventType();

+

+	public IEditCommandRequest getRequest();

+

+	public IEditHelper getEditHelper();

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityAdviceEvent.java
index 6acc4c14e4f..ceaebb3abb7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityAdviceEvent.java
@@ -1,56 +1,56 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class IdentityAdviceEvent extends AbstractIdentityEvent implements IAdviceEvent {
-
-	private IEditHelperAdvice advice;
-
-	private IEditHelperAdvice[] advices;
-
-	private AdvicePhase advicePhase;
-
-	public IdentityAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
-		super(req, editHelper);
-		this.advice = advice;
-		this.advices = advices;
-		this.advicePhase = advicePhase;
-	}
-
-	/**
-	 * @return the advice
-	 */
-	@Override
-	public IEditHelperAdvice getAdvice() {
-		return advice;
-	}
-
-	/**
-	 * @return the advices
-	 */
-	@Override
-	public IEditHelperAdvice[] getAdvices() {
-		return advices;
-	}
-
-	/**
-	 * @return the advicePhase
-	 */
-	public AdvicePhase getAdvicePhase() {
-		return advicePhase;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class IdentityAdviceEvent extends AbstractIdentityEvent implements IAdviceEvent {

+

+	private IEditHelperAdvice advice;

+

+	private IEditHelperAdvice[] advices;

+

+	private AdvicePhase advicePhase;

+

+	public IdentityAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

+		super(req, editHelper);

+		this.advice = advice;

+		this.advices = advices;

+		this.advicePhase = advicePhase;

+	}

+

+	/**

+	 * @return the advice

+	 */

+	@Override

+	public IEditHelperAdvice getAdvice() {

+		return advice;

+	}

+

+	/**

+	 * @return the advices

+	 */

+	@Override

+	public IEditHelperAdvice[] getAdvices() {

+		return advices;

+	}

+

+	/**

+	 * @return the advicePhase

+	 */

+	public AdvicePhase getAdvicePhase() {

+		return advicePhase;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityEditHelperEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityEditHelperEvent.java
index 60351c414ab..cef227624ba 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/IdentityEditHelperEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/IdentityEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class IdentityEditHelperEvent extends AbstractIdentityEvent {
-
-
-	public IdentityEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper) {
-		super(req, editHelper);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class IdentityEditHelperEvent extends AbstractIdentityEvent {

+

+

+	public IdentityEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper) {

+		super(req, editHelper);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ElementTypesConfigurationsEventType.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/TypesEventKind.java
index 386fb4ddad4..1333067dd5b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/ElementTypesConfigurationsEventType.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/TypesEventKind.java
@@ -1,17 +1,17 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-public enum ElementTypesConfigurationsEventType {
-	Disapproved, Unexecutable, Approved, Executable, Identity, RequestConfiguration
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+public enum TypesEventKind {

+	Disapproved, Unexecutable, Approved, Executable, Identity, RequestConfiguration

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableAdviceEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableAdviceEvent.java
index 40ad5a889f7..155f1415426 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableAdviceEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableAdviceEvent.java
@@ -1,57 +1,57 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class UnexecutableAdviceEvent extends AbstractUnexecutableEvent implements IAdviceEvent {
-
-	private IEditHelperAdvice advice;
-
-	private IEditHelperAdvice[] advices;
-
-	private AdvicePhase advicePhase;
-
-	public UnexecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {
-		super(req, editHelper, command);
-		this.advice = advice;
-		this.advices = advices;
-		this.advicePhase = advicePhase;
-	}
-
-	/**
-	 * @return the advice
-	 */
-	@Override
-	public IEditHelperAdvice getAdvice() {
-		return advice;
-	}
-
-	/**
-	 * @return the advices
-	 */
-	@Override
-	public IEditHelperAdvice[] getAdvices() {
-		return advices;
-	}
-
-	/**
-	 * @return the advicePhase
-	 */
-	public AdvicePhase getAdvicePhase() {
-		return advicePhase;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class UnexecutableAdviceEvent extends AbstractUnexecutableEvent implements IAdviceEvent {

+

+	private IEditHelperAdvice advice;

+

+	private IEditHelperAdvice[] advices;

+

+	private AdvicePhase advicePhase;

+

+	public UnexecutableAdviceEvent(IEditCommandRequest req, IEditHelper editHelper, IEditHelperAdvice advice, ICommand command, IEditHelperAdvice[] advices, AdvicePhase advicePhase) {

+		super(req, editHelper, command);

+		this.advice = advice;

+		this.advices = advices;

+		this.advicePhase = advicePhase;

+	}

+

+	/**

+	 * @return the advice

+	 */

+	@Override

+	public IEditHelperAdvice getAdvice() {

+		return advice;

+	}

+

+	/**

+	 * @return the advices

+	 */

+	@Override

+	public IEditHelperAdvice[] getAdvices() {

+		return advices;

+	}

+

+	/**

+	 * @return the advicePhase

+	 */

+	public AdvicePhase getAdvicePhase() {

+		return advicePhase;

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableEditHelperEvent.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableEditHelperEvent.java
index 466940b71c2..05448d6b297 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/notification/events/UnexecutableEditHelperEvent.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/notification/events/UnexecutableEditHelperEvent.java
@@ -1,24 +1,24 @@
-/*****************************************************************************
- * Copyright (c) 2016 CEA LIST and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.notification.events;
-
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-
-public class UnexecutableEditHelperEvent extends AbstractUnexecutableEvent {
-
-	public UnexecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {
-		super(req, editHelper, command);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2016 CEA LIST and others.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.core.notification.events;

+

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+

+public class UnexecutableEditHelperEvent extends AbstractUnexecutableEvent {

+

+	public UnexecutableEditHelperEvent(IEditCommandRequest req, IEditHelper editHelper, ICommand command) {

+		super(req, editHelper, command);

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/AdviceConfigurationTypeRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/AdviceConfigurationTypeRegistry.java
index b77f02da1ef..35bd5225e06 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/AdviceConfigurationTypeRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/AdviceConfigurationTypeRegistry.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 459174
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
+package org.eclipse.papyrus.infra.types.core.registries;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,14 +22,14 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredEditHelperAdviceDescriptor;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IAdviceConfigurationTypeExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IEditHelperAdviceFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.DefaultAdviceBindingFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.DefaultEditHelperAdviceFactory;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.IConfiguredEditHelperAdviceDescriptor;
+import org.eclipse.papyrus.infra.types.core.extensionpoints.IAdviceKindExtensionPoint;
+import org.eclipse.papyrus.infra.types.core.factories.IEditHelperAdviceFactory;
+import org.eclipse.papyrus.infra.types.core.factories.impl.DefaultAdviceBindingFactory;
+import org.eclipse.papyrus.infra.types.core.factories.impl.DefaultEditHelperAdviceFactory;
 
 public class AdviceConfigurationTypeRegistry {
 
@@ -55,11 +55,11 @@ public class AdviceConfigurationTypeRegistry {
 	 */
 	protected void init() {
 		adviceConfigurationTypeToFactory = new HashMap<String, IEditHelperAdviceFactory<? extends AdviceConfiguration>>();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IAdviceConfigurationTypeExtensionPoint.EXTENSION_POINT_ID);
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IAdviceKindExtensionPoint.EXTENSION_POINT_ID);
 		for (IConfigurationElement configurationElement : elements) {
-			String configurationClass = configurationElement.getAttribute(IAdviceConfigurationTypeExtensionPoint.CONFIGURATION_CLASS);
+			String configurationClass = configurationElement.getAttribute(IAdviceKindExtensionPoint.CONFIGURATION_CLASS);
 			try {
-				Object factoryClass = configurationElement.createExecutableExtension(IAdviceConfigurationTypeExtensionPoint.FACTORY_CLASS);
+				Object factoryClass = configurationElement.createExecutableExtension(IAdviceKindExtensionPoint.FACTORY_CLASS);
 				if (factoryClass instanceof IEditHelperAdviceFactory) {
 					adviceConfigurationTypeToFactory.put(configurationClass, (IEditHelperAdviceFactory<?>) factoryClass);
 				}
@@ -68,8 +68,8 @@ public class AdviceConfigurationTypeRegistry {
 			}
 		}
 		// Register default interpretations
-		adviceConfigurationTypeToFactory.put(ElementtypesconfigurationsPackage.eINSTANCE.getEditHelperAdviceConfiguration().getInstanceTypeName(), new DefaultEditHelperAdviceFactory());
-		adviceConfigurationTypeToFactory.put(ElementtypesconfigurationsPackage.eINSTANCE.getAdviceBindingConfiguration().getInstanceTypeName(), new DefaultAdviceBindingFactory());
+		adviceConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getEditHelperAdviceConfiguration().getInstanceTypeName(), new DefaultEditHelperAdviceFactory());
+		adviceConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getAdviceBindingConfiguration().getInstanceTypeName(), new DefaultAdviceBindingFactory());
 	}
 
 	public <T extends AdviceConfiguration> IEditHelperAdviceFactory<T> getFactory(AdviceConfiguration adviceConfiguration) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ContainerConfigurationTypeRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ContainerConfigurationTypeRegistry.java
index 9077fd53925..32159cd95e7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ContainerConfigurationTypeRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ContainerConfigurationTypeRegistry.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
+package org.eclipse.papyrus.infra.types.core.registries;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,12 +22,12 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.gmf.runtime.emf.type.core.IContainerDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IConfiguredContainerDescriptor;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IContainerConfigurationTypeExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IContainerFactory;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.IConfiguredContainerDescriptor;
+import org.eclipse.papyrus.infra.types.core.extensionpoints.IContainerConfigurationKindExtensionPoint;
+import org.eclipse.papyrus.infra.types.core.factories.IContainerFactory;
 
 /**
  * Registry that manages all possible containerConfiguration
@@ -56,11 +56,11 @@ public class ContainerConfigurationTypeRegistry {
 	 */
 	protected void init() {
 		containerConfigurationTypeToFactory = new HashMap<String, IContainerFactory<? extends ContainerConfiguration>>();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IContainerConfigurationTypeExtensionPoint.EXTENSION_POINT_ID);
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IContainerConfigurationKindExtensionPoint.EXTENSION_POINT_ID);
 		for (IConfigurationElement configurationElement : elements) {
-			String configurationClass = configurationElement.getAttribute(IContainerConfigurationTypeExtensionPoint.CONFIGURATION_CLASS);
+			String configurationClass = configurationElement.getAttribute(IContainerConfigurationKindExtensionPoint.CONFIGURATION_CLASS);
 			try {
-				Object factoryClass = configurationElement.createExecutableExtension(IContainerConfigurationTypeExtensionPoint.FACTORY_CLASS);
+				Object factoryClass = configurationElement.createExecutableExtension(IContainerConfigurationKindExtensionPoint.FACTORY_CLASS);
 				if (factoryClass instanceof IContainerFactory) {
 					containerConfigurationTypeToFactory.put(configurationClass, (IContainerFactory<?>) factoryClass);
 				}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeConfigurationTypeRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeConfigurationTypeRegistry.java
index 75ade6eace9..b65a2ec732f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeConfigurationTypeRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeConfigurationTypeRegistry.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
+package org.eclipse.papyrus.infra.types.core.registries;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,13 +20,13 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IElementTypeConfigurationTypeExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IElementTypeConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.MetamodelTypeFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.SpecializationTypeFactory;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.extensionpoints.IElementTypeConfigurationKindExtensionPoint;
+import org.eclipse.papyrus.infra.types.core.factories.IElementTypeConfigurationFactory;
+import org.eclipse.papyrus.infra.types.core.factories.impl.MetamodelTypeFactory;
+import org.eclipse.papyrus.infra.types.core.factories.impl.SpecializationTypeFactory;
 
 /**
  * Registry that manages all possible elementTypeConfigurationTypes
@@ -55,11 +55,11 @@ public class ElementTypeConfigurationTypeRegistry {
 	 */
 	protected void init() {
 		elementTypeConfigurationTypeToFactory = new HashMap<String, IElementTypeConfigurationFactory<? extends ElementTypeConfiguration>>();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IElementTypeConfigurationTypeExtensionPoint.EXTENSION_POINT_ID);
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IElementTypeConfigurationKindExtensionPoint.EXTENSION_POINT_ID);
 		for (IConfigurationElement configurationElement : elements) {
-			String configurationClass = configurationElement.getAttribute(IElementTypeConfigurationTypeExtensionPoint.CONFIGURATION_CLASS);
+			String configurationClass = configurationElement.getAttribute(IElementTypeConfigurationKindExtensionPoint.CONFIGURATION_CLASS);
 			try {
-				Object factoryClass = configurationElement.createExecutableExtension(IElementTypeConfigurationTypeExtensionPoint.FACTORY_CLASS);
+				Object factoryClass = configurationElement.createExecutableExtension(IElementTypeConfigurationKindExtensionPoint.FACTORY_CLASS);
 				if (factoryClass instanceof IElementTypeConfigurationFactory) {
 					elementTypeConfigurationTypeToFactory.put(configurationClass, (IElementTypeConfigurationFactory<?>) factoryClass);
 				}
@@ -68,8 +68,8 @@ public class ElementTypeConfigurationTypeRegistry {
 			}
 		}
 		// Register default interpretations
-		elementTypeConfigurationTypeToFactory.put(ElementtypesconfigurationsPackage.eINSTANCE.getMetamodelTypeConfiguration().getInstanceTypeName(), new MetamodelTypeFactory());
-		elementTypeConfigurationTypeToFactory.put(ElementtypesconfigurationsPackage.eINSTANCE.getSpecializationTypeConfiguration().getInstanceTypeName(), new SpecializationTypeFactory());
+		elementTypeConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getMetamodelTypeConfiguration().getInstanceTypeName(), new MetamodelTypeFactory());
+		elementTypeConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getSpecializationTypeConfiguration().getInstanceTypeName(), new SpecializationTypeFactory());
 	}
 
 	protected <T extends ElementTypeConfiguration> IElementTypeConfigurationFactory<T> getFactory(ElementTypeConfiguration elementTypeConfiguration) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
index 9b8027227e2..65f8e6e4ac3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/ElementTypeSetConfigurationRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/ElementTypeSetConfigurationRegistry.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2014, 2016 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2015 CEA LIST, Christian W. Damus, and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,10 +8,11 @@
  *
  * Contributors:
  *  CEA LIST - Initial API and implementation
- *  Christian W. Damus - bugs 459174, 467207, 485220
+ *  Christian W. Damus - bug 459174
+ *  Christian W. Damus - bug 467207
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
+package org.eclipse.papyrus.infra.types.core.registries;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,16 +42,16 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
 import org.eclipse.gmf.runtime.emf.type.core.NullElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IElementTypeSetExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeConfigurationCycleUtil;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeRegistryUtils;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.OrientedGraph;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.extensionpoints.IElementTypeSetExtensionPoint;
+import org.eclipse.papyrus.infra.types.core.utils.ElementTypeRegistryUtils;
+import org.eclipse.papyrus.infra.types.core.utils.OrientedGraph;
+import org.eclipse.papyrus.infra.types.core.utils.TypesConfigurationsCycleUtil;
 import org.osgi.framework.Bundle;
 
 /**
@@ -259,6 +260,10 @@ public class ElementTypeSetConfigurationRegistry {
 		// Read from elementTypeSetConfigurations
 		Set<ElementTypeSetConfiguration> registrableElementTypeSetConfiguration = new HashSet<ElementTypeSetConfiguration>();
 		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurationsToRegister) {
+			if (elementTypeSetConfiguration == null) {
+				Activator.log.warn("The collection of elementTypesconfigurations contains a null value. Loading aborted. ");
+				return false;
+			}
 			// Check if not already registered
 			if (elementTypeSetConfigurations.containsKey(elementTypeSetConfiguration.getIdentifier())) {
 				Activator.log.warn("The following ElementTypesSetConfiguration has been ignored because the same ID already registreted: " + elementTypeSetConfiguration.getIdentifier());
@@ -280,9 +285,9 @@ public class ElementTypeSetConfigurationRegistry {
 		}
 		// The new ones we wan to register
 		elementTypesToCheck.addAll(elementTypeConfigurationsDefinitions.values());
-		OrientedGraph<String> elementTypesDeps = ElementTypeConfigurationCycleUtil.getDependenciesAmongElementTypes(elementTypesToCheck);
+		OrientedGraph<String> elementTypesDeps = TypesConfigurationsCycleUtil.getDependenciesAmongElementTypes(elementTypesToCheck);
 
-		Collection<Collection<Object>> cyclesElementTypes = ElementTypeConfigurationCycleUtil.getCyclesAmongElementTypes(elementTypesDeps.getVertices(), elementTypesDeps.getEdges());
+		Collection<Collection<Object>> cyclesElementTypes = TypesConfigurationsCycleUtil.getCyclesAmongElementTypes(elementTypesDeps.getVertices(), elementTypesDeps.getEdges());
 		if (!cyclesElementTypes.isEmpty()) {
 			Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there is at least a cyclic-dependency in the ElementTypes definitions: " + cyclesElementTypes);
 			return false;
@@ -295,7 +300,7 @@ public class ElementTypeSetConfigurationRegistry {
 			for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contexId).values()) {
 				TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 				while (it.hasNext()) {
-					EObject element = it.next();
+					EObject element = (EObject) it.next();
 					if (element instanceof AdviceConfiguration) {
 						adviceToCheck.add((AdviceConfiguration) element);
 					}
@@ -307,7 +312,7 @@ public class ElementTypeSetConfigurationRegistry {
 		for (ElementTypeSetConfiguration elementTypeSetConfiguration : registrableElementTypeSetConfiguration) {
 			TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 			while (it.hasNext()) {
-				EObject element = it.next();
+				EObject element = (EObject) it.next();
 				if (element instanceof AdviceConfiguration) {
 					adviceToCheck.add((AdviceConfiguration) element);
 
@@ -316,8 +321,8 @@ public class ElementTypeSetConfigurationRegistry {
 		}
 
 		// Check that there is no cyclic dependencies among advices introduced by this loading
-		advicesDeps = ElementTypeConfigurationCycleUtil.getDependenciesAmongAdvices(adviceToCheck);
-		Collection<Collection<Object>> cyclesAdvices = ElementTypeConfigurationCycleUtil.getCyclesInAdvices(advicesDeps.getVertices(), advicesDeps.getEdges());
+		advicesDeps = TypesConfigurationsCycleUtil.getDependenciesAmongAdvices(adviceToCheck);
+		Collection<Collection<Object>> cyclesAdvices = TypesConfigurationsCycleUtil.getCyclesInAdvices(advicesDeps.getVertices(), advicesDeps.getEdges());
 		if (!cyclesAdvices.isEmpty()) {
 			Activator.log.warn("The ElementTypesConfiguration registration has been aborted because there is at least a cyclic-dependencies in the Advices definitions: " + cyclesAdvices);
 			return false;
@@ -403,14 +408,14 @@ public class ElementTypeSetConfigurationRegistry {
 		for (ElementTypeSetConfiguration elementTypeSetConfiguration : elementTypeSetConfigurations.get(contextId).values()) {
 			TreeIterator<EObject> it = elementTypeSetConfiguration.eAllContents();
 			while (it.hasNext()) {
-				EObject element = it.next();
+				EObject element = (EObject) it.next();
 				if (element instanceof AdviceConfiguration) {
 					advices.add((AdviceConfiguration) element);
 				}
 
 			}
 		}
-		advicesDeps = ElementTypeConfigurationCycleUtil.getDependenciesAmongAdvices(advices);
+		advicesDeps = TypesConfigurationsCycleUtil.getDependenciesAmongAdvices(advices);
 
 		return true;
 	}
@@ -448,10 +453,9 @@ public class ElementTypeSetConfigurationRegistry {
 				Activator.log.debug("-  ClientContext the model should be registreted to: " + clientContextId);
 				Activator.log.debug("-  id of the container bundle: " + contributorID);
 			}
-
 			ElementTypeSetConfiguration set = getElementTypeSetConfiguration(modelPath, contributorID);
+
 			if (set != null) {
-				// It will be null if the file was absent or malformed and so failed to load.
 				addElementTypeSetConfigurationToDefinitions(set, clientContextId, existingDefinitions);
 			}
 
@@ -495,33 +499,36 @@ public class ElementTypeSetConfigurationRegistry {
 		if (Platform.isFragment(bundle)) {
 			ElementTypeSetConfiguration configuration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
 			if (configuration == null) {
-				Activator.log.warn("Failed to load resource " + modelPath + " from bundle " + bundleId);
+				Activator.log.warn("Cannot find resource " + modelPath + " in bundle " + bundleId);
 			}
 			return configuration;
 		} else { // this is a plugin. Search in sub fragments, then in the plugin
-			ElementTypeSetConfiguration elementTypeSetConfiguration = null;
-
 			Bundle[] fragments = Platform.getFragments(bundle);
+			// no fragment, so the file should be in the plugin itself
+			if (fragments == null) {
+				return getElementTypeSetConfigurationInBundle(modelPath, bundleId);
+			} else {
+
+				ElementTypeSetConfiguration elementTypeSetConfiguration = null;
 
-			if (fragments != null) {
 				for (Bundle fragment : fragments) {
 					elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, fragment.getSymbolicName());
 					if (elementTypeSetConfiguration != null) {
 						break;
 					}
 				}
-			} // else no fragments, so the file should be in the plugin, itself
 
-			if (elementTypeSetConfiguration == null) {
-				// not found in fragments. Look in the plugin itself
-				elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
-			}
+				if (elementTypeSetConfiguration == null) {
+					// not found in fragments. Look in the plugin itself
+					elementTypeSetConfiguration = getElementTypeSetConfigurationInBundle(modelPath, bundleId);
+				}
 
-			if (elementTypeSetConfiguration == null) {
-				Activator.log.warn("Failed to load resource " + modelPath + " from bundle " + bundleId);
-			}
+				if (elementTypeSetConfiguration == null) {
+					Activator.log.warn("Cannot find resource " + modelPath + " in bundle " + bundleId);
+				}
 
-			return elementTypeSetConfiguration;
+				return elementTypeSetConfiguration;
+			}
 		}
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/MatcherConfigurationTypeRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/MatcherConfigurationTypeRegistry.java
index f81a7efdf07..572a9397348 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/registries/MatcherConfigurationTypeRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/registries/MatcherConfigurationTypeRegistry.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.registries;
+package org.eclipse.papyrus.infra.types.core.registries;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,12 +20,12 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.extensionpoints.IMatcherConfigurationTypeExtensionPoint;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.DefaultMatcherFactory;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.core.Activator;
+import org.eclipse.papyrus.infra.types.core.extensionpoints.IMatcherConfigurationKindExtensionPoint;
+import org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory;
+import org.eclipse.papyrus.infra.types.core.factories.impl.DefaultMatcherFactory;
 
 public class MatcherConfigurationTypeRegistry {
 
@@ -43,11 +43,11 @@ public class MatcherConfigurationTypeRegistry {
 
 	protected void init() {
 		matcherConfigurationTypeToFactory = new HashMap<String, IMatcherFactory<? extends AbstractMatcherConfiguration>>();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IMatcherConfigurationTypeExtensionPoint.EXTENSION_POINT_ID);
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IMatcherConfigurationKindExtensionPoint.EXTENSION_POINT_ID);
 		for (IConfigurationElement configurationElement : elements) {
-			String configurationClass = configurationElement.getAttribute(IMatcherConfigurationTypeExtensionPoint.CONFIGURATION_CLASS);
+			String configurationClass = configurationElement.getAttribute(IMatcherConfigurationKindExtensionPoint.CONFIGURATION_CLASS);
 			try {
-				Object factoryClass = configurationElement.createExecutableExtension(IMatcherConfigurationTypeExtensionPoint.FACTORY_CLASS);
+				Object factoryClass = configurationElement.createExecutableExtension(IMatcherConfigurationKindExtensionPoint.FACTORY_CLASS);
 				if (factoryClass instanceof IMatcherFactory) {
 					matcherConfigurationTypeToFactory.put(configurationClass, (IMatcherFactory<?>) factoryClass);
 				}
@@ -56,7 +56,7 @@ public class MatcherConfigurationTypeRegistry {
 			}
 		}
 		// Register default interpretation
-		matcherConfigurationTypeToFactory.put(ElementtypesconfigurationsPackage.eINSTANCE.getMatcherConfiguration().getInstanceTypeName(), new DefaultMatcherFactory());
+		matcherConfigurationTypeToFactory.put(ElementTypesConfigurationsPackage.eINSTANCE.getMatcherConfiguration().getInstanceTypeName(), new DefaultMatcherFactory());
 	}
 
 	protected <T extends AbstractMatcherConfiguration> IMatcherFactory<T> getFactory(T matcherConfiguration) {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/AdviceComparator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
index 74626a3308f..5f8c3befd49 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/AdviceComparator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/AdviceComparator.java
@@ -11,12 +11,12 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+package org.eclipse.papyrus.infra.types.core.utils;

 

 import java.util.Comparator;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

 

 

 public class AdviceComparator implements Comparator<IEditHelperAdvice> {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/ElementTypeRegistryUtils.java
index 15678343ae6..0981619d310 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeRegistryUtils.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/ElementTypeRegistryUtils.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 459174

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+package org.eclipse.papyrus.infra.types.core.utils;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

+import org.eclipse.papyrus.infra.types.core.Activator;

 

 public class ElementTypeRegistryUtils {

 

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/OrientedGraph.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/OrientedGraph.java
index bc4107f3acb..ea61fc8a1dd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/OrientedGraph.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/OrientedGraph.java
@@ -11,7 +11,7 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+package org.eclipse.papyrus.infra.types.core.utils;

 

 import java.util.HashMap;

 import java.util.HashSet;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeConfigurationCycleUtil.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
index 9c25d38f5d3..7ea83f59f05 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/utils/ElementTypeConfigurationCycleUtil.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.core/src/org/eclipse/papyrus/infra/types/core/utils/TypesConfigurationsCycleUtil.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.infra.elementtypesconfigurations.utils;

+package org.eclipse.papyrus.infra.types.core.utils;

 

 import java.util.ArrayList;

 import java.util.Collection;

@@ -10,14 +10,14 @@ import java.util.Set;
 import java.util.Stack;

 

 import org.eclipse.gmf.runtime.emf.type.core.IAdviceBindingDescriptor;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.AdviceConfigurationTypeRegistry;

+import org.eclipse.papyrus.infra.types.AdviceConfiguration;

+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;

+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;

+import org.eclipse.papyrus.infra.types.core.Activator;

+import org.eclipse.papyrus.infra.types.core.registries.AdviceConfigurationTypeRegistry;

 

 //Implements Tarjan's strongly connected components algorithm

-public class ElementTypeConfigurationCycleUtil {

+public class TypesConfigurationsCycleUtil {

 

 

 	protected static Collection<Collection<Object>> computeStronglyConnectedComponents(Set<String> vertices, Map<String, Set<String>> edges) {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.classpath
index 858bac421b8..858bac421b8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.classpath
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.classpath
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project
new file mode 100644
index 00000000000..83a370a8728
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.types.edit</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..4d72ad12656 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0821d2166a6
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.infra.types.provider

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.papyrus.infra.types;visibility:=reexport,

+ org.eclipse.emf.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0";visibility:=reexport

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin$Implementation

+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.edit;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
index f6981c49151..f6981c49151 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
index 6135e64b5fc..6135e64b5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
index d84cb0a088c..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
index 6135e64b5fc..6135e64b5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_containerConfiguration_ContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
index d84cb0a088c..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif
index d84cb0a088c..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif
index 6f73fe27ba1..6f73fe27ba1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeConfiguration_iconEntry_IconEntry.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif
index 06f97473e10..06f97473e10 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_AdviceBindingConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif
index d1e84691c85..d1e84691c85 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_MetamodelTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif
index f6149c3081a..f6149c3081a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_SpecializationTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif
index 6135e64b5fc..6135e64b5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_containerConfiguration_ContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif
index 75f44fbcbc9..75f44fbcbc9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_editHelperAdviceConfiguration_EditHelperAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif
index d84cb0a088c..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/AdviceBindingConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/AdviceBindingConfiguration.gif
index 06f97473e10..06f97473e10 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/AdviceBindingConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/AdviceBindingConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/ContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ContainerConfiguration.gif
index 6135e64b5fc..6135e64b5fc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/ContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/EditHelperAdviceConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/EditHelperAdviceConfiguration.gif
index 75f44fbcbc9..75f44fbcbc9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/EditHelperAdviceConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/EditHelperAdviceConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/ElementTypeSetConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ElementTypeSetConfiguration.gif
index 68acdf43c80..68acdf43c80 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/ElementTypeSetConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/ElementTypeSetConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/IconEntry.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/IconEntry.gif
index 6f73fe27ba1..6f73fe27ba1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/IconEntry.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/IconEntry.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/MatcherConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/MatcherConfiguration.gif
index d84cb0a088c..d84cb0a088c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/MatcherConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/MatcherConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/MetamodelTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/MetamodelTypeConfiguration.gif
index d1e84691c85..d1e84691c85 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/MetamodelTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/MetamodelTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/SpecializationTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/SpecializationTypeConfiguration.gif
index f6149c3081a..f6149c3081a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/icons/full/obj16/SpecializationTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/icons/full/obj16/SpecializationTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
index 6165b1eca59..7a9ac74f45c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:
 #  CEA LIST - Initial API and implementation
 
-pluginName = Papyrus ElementTypesConfigurations Edit Support
+pluginName = Papyrus TypesConfigurations Edit Support
 providerName = Eclipse Modeling Project
 
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.xml
index e53a18745aa..5d3afce825c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/plugin.xml
@@ -1,33 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2014 CEA LIST.
- 
- 
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- 
- Contributors:
-  CEA LIST - Initial API and implementation
--->
-
-<plugin>
-
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated ElementTypesConfigurations -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementtypesconfigurationsItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<!--

+ Copyright (c) 2014 CEA LIST.

+ 

+ 

+ All rights reserved. This program and the accompanying materials

+ are made available under the terms of the Eclipse Public License v1.0

+ which accompanies this distribution, and is available at

+ http://www.eclipse.org/legal/epl-v10.html

+ 

+ Contributors:

+  CEA LIST - Initial API and implementation

+-->

+

+<plugin>

+

+

+

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated ElementTypesConfigurations -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

+            class="org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+</plugin>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml
index d877e3e155b..f5a3f6077da 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/pom.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/pom.xml
@@ -2,11 +2,11 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra</artifactId>
+		<artifactId>org.eclipse.papyrus.infra-types</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.edit</artifactId>
+	<artifactId>org.eclipse.papyrus.infra.types.edit</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AbstractAdviceBindingConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
index 4233fb3bddd..7494565c8e4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AbstractAdviceBindingConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractAdviceBindingConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -26,12 +26,12 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -78,7 +78,7 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 				 getResourceLocator(),
 				 getString("_UI_IdentifiedConfiguration_identifier_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_IdentifiedConfiguration_identifier_feature", "_UI_IdentifiedConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.IDENTIFIED_CONFIGURATION__IDENTIFIER,
+				 ElementTypesConfigurationsPackage.Literals.IDENTIFIED_CONFIGURATION__IDENTIFIER,
 				 true,
 				 false,
 				 false,
@@ -100,7 +100,7 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 				 getResourceLocator(),
 				 getString("_UI_AbstractAdviceBindingConfiguration_target_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractAdviceBindingConfiguration_target_feature", "_UI_AbstractAdviceBindingConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET,
+				 ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET,
 				 true,
 				 false,
 				 true,
@@ -122,7 +122,7 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 				 getResourceLocator(),
 				 getString("_UI_AbstractAdviceBindingConfiguration_inheritance_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_AbstractAdviceBindingConfiguration_inheritance_feature", "_UI_AbstractAdviceBindingConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE,
+				 ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE,
 				 true,
 				 false,
 				 false,
@@ -143,8 +143,8 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION);
 		}
 		return childrenFeatures;
 	}
@@ -189,12 +189,12 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AbstractAdviceBindingConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -214,13 +214,13 @@ public class AbstractAdviceBindingConfigurationItemProvider extends AdviceConfig
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createContainerConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createContainerConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AbstractEditHelperAdviceConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractEditHelperAdviceConfigurationItemProvider.java
index bfe94bc4e18..f72e7d3a639 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AbstractEditHelperAdviceConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractEditHelperAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -21,10 +21,10 @@ import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AbstractMatcherConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractMatcherConfigurationItemProvider.java
index 555ec92c984..8f2623c899b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AbstractMatcherConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AbstractMatcherConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -31,7 +31,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AdviceBindingConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceBindingConfigurationItemProvider.java
index b7b5d07aa84..70197640729 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AdviceBindingConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceBindingConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -24,11 +24,11 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -73,7 +73,7 @@ public class AdviceBindingConfigurationItemProvider extends AbstractAdviceBindin
 				 getResourceLocator(),
 				 getString("_UI_AdviceBindingConfiguration_editHelperAdviceClassName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_AdviceBindingConfiguration_editHelperAdviceClassName_feature", "_UI_AdviceBindingConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME,
+				 ElementTypesConfigurationsPackage.Literals.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME,
 				 true,
 				 false,
 				 false,
@@ -101,7 +101,7 @@ public class AdviceBindingConfigurationItemProvider extends AbstractAdviceBindin
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((AdviceBindingConfiguration)object).getIdentifier();
+		String label = ((AdviceBindingConfiguration)object).getEditHelperAdviceClassName();
 		return label == null || label.length() == 0 ?
 			getString("_UI_AdviceBindingConfiguration_type") :
 			getString("_UI_AdviceBindingConfiguration_type") + " " + label;
@@ -120,7 +120,7 @@ public class AdviceBindingConfigurationItemProvider extends AbstractAdviceBindin
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AdviceBindingConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AdviceConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java
index dba405a82dc..6c04ba8a5a6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/AdviceConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/AdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -24,11 +24,11 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.AdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -74,7 +74,7 @@ public class AdviceConfigurationItemProvider extends ConfigurationElementItemPro
 				 getResourceLocator(),
 				 getString("_UI_AdviceConfiguration_before_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_AdviceConfiguration_before_feature", "_UI_AdviceConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ADVICE_CONFIGURATION__BEFORE,
+				 ElementTypesConfigurationsPackage.Literals.ADVICE_CONFIGURATION__BEFORE,
 				 true,
 				 false,
 				 false,
@@ -96,7 +96,7 @@ public class AdviceConfigurationItemProvider extends ConfigurationElementItemPro
 				 getResourceLocator(),
 				 getString("_UI_AdviceConfiguration_after_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_AdviceConfiguration_after_feature", "_UI_AdviceConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ADVICE_CONFIGURATION__AFTER,
+				 ElementTypesConfigurationsPackage.Literals.ADVICE_CONFIGURATION__AFTER,
 				 true,
 				 false,
 				 false,
@@ -132,8 +132,8 @@ public class AdviceConfigurationItemProvider extends ConfigurationElementItemPro
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(AdviceConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ConfigurationElementItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ConfigurationElementItemProvider.java
index 0fc4adf7ace..cfb3a38c4a5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ConfigurationElementItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ConfigurationElementItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -33,11 +33,11 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ConfigurationElement} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -89,7 +89,7 @@ public class ConfigurationElementItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ConfigurationElement_description_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ConfigurationElement_description_feature", "_UI_ConfigurationElement_type"),
-				 ElementtypesconfigurationsPackage.Literals.CONFIGURATION_ELEMENT__DESCRIPTION,
+				 ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT__DESCRIPTION,
 				 true,
 				 false,
 				 false,
@@ -125,7 +125,7 @@ public class ConfigurationElementItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ConfigurationElement.class)) {
-			case ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ContainerConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ContainerConfigurationItemProvider.java
index a6d6ae62dd6..f2019ff1970 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ContainerConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ContainerConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -34,12 +34,12 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ContainerConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -91,7 +91,7 @@ public class ContainerConfigurationItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ContainerConfiguration_eContainmentFeatures_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ContainerConfiguration_eContainmentFeatures_feature", "_UI_ContainerConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES,
+				 ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES,
 				 true,
 				 false,
 				 true,
@@ -112,7 +112,7 @@ public class ContainerConfigurationItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION);
 		}
 		return childrenFeatures;
 	}
@@ -165,7 +165,7 @@ public class ContainerConfigurationItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ContainerConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -185,8 +185,8 @@ public class ContainerConfigurationItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
 	}
 
 	/**
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/EditHelperAdviceConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/EditHelperAdviceConfigurationItemProvider.java
index 3b918b8071f..83759b12221 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/EditHelperAdviceConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/EditHelperAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -24,11 +24,11 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -73,7 +73,7 @@ public class EditHelperAdviceConfigurationItemProvider extends AbstractEditHelpe
 				 getResourceLocator(),
 				 getString("_UI_EditHelperAdviceConfiguration_editHelperAdviceClassName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_EditHelperAdviceConfiguration_editHelperAdviceClassName_feature", "_UI_EditHelperAdviceConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME,
+				 ElementTypesConfigurationsPackage.Literals.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME,
 				 true,
 				 false,
 				 false,
@@ -120,7 +120,7 @@ public class EditHelperAdviceConfigurationItemProvider extends AbstractEditHelpe
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(EditHelperAdviceConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeConfigurationItemProvider.java
index 60b83e0d1a5..ab1e4089955 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -26,12 +26,12 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -79,7 +79,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 				 getResourceLocator(),
 				 getString("_UI_IdentifiedConfiguration_identifier_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_IdentifiedConfiguration_identifier_feature", "_UI_IdentifiedConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.IDENTIFIED_CONFIGURATION__IDENTIFIER,
+				 ElementTypesConfigurationsPackage.Literals.IDENTIFIED_CONFIGURATION__IDENTIFIER,
 				 true,
 				 false,
 				 false,
@@ -101,7 +101,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 				 getResourceLocator(),
 				 getString("_UI_NamedConfiguration_name_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_NamedConfiguration_name_feature", "_UI_NamedConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.NAMED_CONFIGURATION__NAME,
+				 ElementTypesConfigurationsPackage.Literals.NAMED_CONFIGURATION__NAME,
 				 true,
 				 false,
 				 false,
@@ -123,7 +123,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 				 getResourceLocator(),
 				 getString("_UI_ElementTypeConfiguration_hint_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_hint_feature", "_UI_ElementTypeConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__HINT,
+				 ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__HINT,
 				 true,
 				 false,
 				 false,
@@ -145,7 +145,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 				 getResourceLocator(),
 				 getString("_UI_ElementTypeConfiguration_kind_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeConfiguration_kind_feature", "_UI_ElementTypeConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__KIND,
+				 ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__KIND,
 				 true,
 				 false,
 				 false,
@@ -166,7 +166,7 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY);
 		}
 		return childrenFeatures;
 	}
@@ -211,13 +211,13 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ElementTypeConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -237,8 +237,8 @@ public class ElementTypeConfigurationItemProvider extends ConfigurationElementIt
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createIconEntry()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createIconEntry()));
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementTypeSetConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java
index d8dd498a142..258f57d803b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementTypeSetConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypeSetConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -26,12 +26,12 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -78,7 +78,7 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 				 getResourceLocator(),
 				 getString("_UI_IdentifiedConfiguration_identifier_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_IdentifiedConfiguration_identifier_feature", "_UI_IdentifiedConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.IDENTIFIED_CONFIGURATION__IDENTIFIER,
+				 ElementTypesConfigurationsPackage.Literals.IDENTIFIED_CONFIGURATION__IDENTIFIER,
 				 true,
 				 false,
 				 false,
@@ -100,7 +100,7 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 				 getResourceLocator(),
 				 getString("_UI_NamedConfiguration_name_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_NamedConfiguration_name_feature", "_UI_NamedConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.NAMED_CONFIGURATION__NAME,
+				 ElementTypesConfigurationsPackage.Literals.NAMED_CONFIGURATION__NAME,
 				 true,
 				 false,
 				 false,
@@ -122,7 +122,7 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 				 getResourceLocator(),
 				 getString("_UI_ElementTypeSetConfiguration_metamodelNsURI_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ElementTypeSetConfiguration_metamodelNsURI_feature", "_UI_ElementTypeSetConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI,
+				 ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI,
 				 true,
 				 false,
 				 false,
@@ -143,8 +143,8 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
 		}
 		return childrenFeatures;
 	}
@@ -200,13 +200,13 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ElementTypeSetConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -226,18 +226,18 @@ public class ElementTypeSetConfigurationItemProvider extends ConfigurationElemen
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createSpecializationTypeConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createSpecializationTypeConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createMetamodelTypeConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createMetamodelTypeConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createAdviceBindingConfiguration()));
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementtypesconfigurationsItemProviderAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java
index 51845ccf4d1..ef2a007e8a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementtypesconfigurationsItemProviderAdapterFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/ElementTypesConfigurationsItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38,9 +38,9 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsAdapterFactory;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -51,7 +51,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.util.Elementtypescon
  * <!-- end-user-doc -->
  * @generated
  */
-public class ElementtypesconfigurationsItemProviderAdapterFactory extends ElementtypesconfigurationsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
+public class ElementTypesConfigurationsItemProviderAdapterFactory extends ElementTypesConfigurationsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -74,7 +74,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(ElementTypesConfigurationsEditPlugin.INSTANCE, ElementtypesconfigurationsPackage.eNS_URI);
+	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(TypesConfigurationsEditPlugin.INSTANCE, ElementTypesConfigurationsPackage.eNS_URI);
 
 	/**
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
@@ -90,7 +90,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsItemProviderAdapterFactory() {
+	public ElementTypesConfigurationsItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -99,7 +99,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -107,7 +107,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected ElementTypeSetConfigurationItemProvider elementTypeSetConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -122,7 +122,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.IconEntry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -130,7 +130,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected IconEntryItemProvider iconEntryItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.IconEntry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -145,7 +145,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -153,7 +153,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected SpecializationTypeConfigurationItemProvider specializationTypeConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -168,7 +168,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.ContainerConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -176,7 +176,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected ContainerConfigurationItemProvider containerConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.ContainerConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -191,7 +191,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -199,7 +199,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected MetamodelTypeConfigurationItemProvider metamodelTypeConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -214,7 +214,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -222,7 +222,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected EditHelperAdviceConfigurationItemProvider editHelperAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -237,7 +237,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -245,7 +245,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected AdviceBindingConfigurationItemProvider adviceBindingConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -260,7 +260,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.MatcherConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -268,7 +268,7 @@ public class ElementtypesconfigurationsItemProviderAdapterFactory extends Elemen
 	protected MatcherConfigurationItemProvider matcherConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.MatcherConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/IconEntryItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/IconEntryItemProvider.java
index ecb95d75d3d..382e93aaed8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/IconEntryItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/IconEntryItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -33,11 +33,11 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IconEntry;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.IconEntry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -90,7 +90,7 @@ public class IconEntryItemProvider
 				 getResourceLocator(),
 				 getString("_UI_IconEntry_iconPath_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_iconPath_feature", "_UI_IconEntry_type"),
-				 ElementtypesconfigurationsPackage.Literals.ICON_ENTRY__ICON_PATH,
+				 ElementTypesConfigurationsPackage.Literals.ICON_ENTRY__ICON_PATH,
 				 true,
 				 false,
 				 false,
@@ -112,7 +112,7 @@ public class IconEntryItemProvider
 				 getResourceLocator(),
 				 getString("_UI_IconEntry_bundleId_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_IconEntry_bundleId_feature", "_UI_IconEntry_type"),
-				 ElementtypesconfigurationsPackage.Literals.ICON_ENTRY__BUNDLE_ID,
+				 ElementTypesConfigurationsPackage.Literals.ICON_ENTRY__BUNDLE_ID,
 				 true,
 				 false,
 				 false,
@@ -159,8 +159,8 @@ public class IconEntryItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(IconEntry.class)) {
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__ICON_PATH:
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__ICON_PATH:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/MatcherConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/MatcherConfigurationItemProvider.java
index 5c1fef56b0a..58a2ae3c13b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/MatcherConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/MatcherConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -24,11 +24,11 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.MatcherConfiguration;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.MatcherConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -73,7 +73,7 @@ public class MatcherConfigurationItemProvider extends AbstractMatcherConfigurati
 				 getResourceLocator(),
 				 getString("_UI_MatcherConfiguration_matcherClassName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_MatcherConfiguration_matcherClassName_feature", "_UI_MatcherConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME,
+				 ElementTypesConfigurationsPackage.Literals.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME,
 				 true,
 				 false,
 				 false,
@@ -120,7 +120,7 @@ public class MatcherConfigurationItemProvider extends AbstractMatcherConfigurati
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(MatcherConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/MetamodelTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/MetamodelTypeConfigurationItemProvider.java
index 9e32ceb214a..e2daded37c0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/MetamodelTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/MetamodelTypeConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -24,11 +24,11 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -74,7 +74,7 @@ public class MetamodelTypeConfigurationItemProvider extends ElementTypeConfigura
 				 getResourceLocator(),
 				 getString("_UI_MetamodelTypeConfiguration_eClass_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_MetamodelTypeConfiguration_eClass_feature", "_UI_MetamodelTypeConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.METAMODEL_TYPE_CONFIGURATION__ECLASS,
+				 ElementTypesConfigurationsPackage.Literals.METAMODEL_TYPE_CONFIGURATION__ECLASS,
 				 true,
 				 false,
 				 true,
@@ -96,7 +96,7 @@ public class MetamodelTypeConfigurationItemProvider extends ElementTypeConfigura
 				 getResourceLocator(),
 				 getString("_UI_MetamodelTypeConfiguration_editHelperClassName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_MetamodelTypeConfiguration_editHelperClassName_feature", "_UI_MetamodelTypeConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME,
+				 ElementTypesConfigurationsPackage.Literals.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME,
 				 true,
 				 false,
 				 false,
@@ -143,7 +143,7 @@ public class MetamodelTypeConfigurationItemProvider extends ElementTypeConfigura
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(MetamodelTypeConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/SpecializationTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
index 2aa5fc3783f..971d3ee9336 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/SpecializationTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/SpecializationTypeConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 
 import java.util.Collection;
@@ -26,12 +26,12 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -76,7 +76,7 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 				 getResourceLocator(),
 				 getString("_UI_SpecializationTypeConfiguration_specializedTypesID_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_SpecializationTypeConfiguration_specializedTypesID_feature", "_UI_SpecializationTypeConfiguration_type"),
-				 ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID,
+				 ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID,
 				 true,
 				 false,
 				 false,
@@ -97,9 +97,9 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION);
-			childrenFeatures.add(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION);
+			childrenFeatures.add(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION);
 		}
 		return childrenFeatures;
 	}
@@ -155,12 +155,12 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(SpecializationTypeConfiguration.class)) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -180,18 +180,18 @@ public class SpecializationTypeConfigurationItemProvider extends ElementTypeConf
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createEditHelperAdviceConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createEditHelperAdviceConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createContainerConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createContainerConfiguration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION,
-				 ElementtypesconfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
+				(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION,
+				 ElementTypesConfigurationsFactory.eINSTANCE.createMatcherConfiguration()));
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementTypesConfigurationsEditPlugin.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/TypesConfigurationsEditPlugin.java
index 7a90f1c42c4..6ee7dd7ffda 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/provider/ElementTypesConfigurationsEditPlugin.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.edit/src-gen/org/eclipse/papyrus/infra/types/provider/TypesConfigurationsEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.provider;
+package org.eclipse.papyrus.infra.types.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -22,14 +22,14 @@ import org.eclipse.emf.common.util.ResourceLocator;
  * <!-- end-user-doc -->
  * @generated
  */
-public final class ElementTypesConfigurationsEditPlugin extends EMFPlugin {
+public final class TypesConfigurationsEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final ElementTypesConfigurationsEditPlugin INSTANCE = new ElementTypesConfigurationsEditPlugin();
+	public static final TypesConfigurationsEditPlugin INSTANCE = new TypesConfigurationsEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -45,7 +45,7 @@ public final class ElementTypesConfigurationsEditPlugin extends EMFPlugin {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementTypesConfigurationsEditPlugin() {
+	public TypesConfigurationsEditPlugin() {
 		super
 		  (new ResourceLocator [] {
 		   });
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.classpath
index 75556083f6e..3fb4047155a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/.classpath
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src-gen"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project
new file mode 100644
index 00000000000..415647bf396
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.types.editor</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.core.prefs
index 4d72ad12656..4d72ad12656 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..23729b9058f
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.infra.types.presentation

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.core.resources;visibility:=reexport,

+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.emf.edit.ui;visibility:=reexport,

+ org.eclipse.ui.ide;visibility:=reexport

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.types.presentation.TypesConfigurationsEditorPlugin$Implementation

+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.editor;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
index 2d24be10e74..2d24be10e74 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/icons/full/obj16/ElementtypesconfigurationsModelFile.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/ElementtypesconfigurationsModelFile.gif
index e5c6e175f7f..e5c6e175f7f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/icons/full/obj16/ElementtypesconfigurationsModelFile.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/ElementtypesconfigurationsModelFile.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/TypesConfigurationsModelFile.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/TypesConfigurationsModelFile.gif
new file mode 100644
index 00000000000..8315589c999
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/TypesConfigurationsModelFile.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/TypesModelFile.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/TypesModelFile.gif
new file mode 100644
index 00000000000..9ce977aa287
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/obj16/TypesModelFile.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/icons/full/wizban/NewElementtypesconfigurations.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewElementtypesconfigurations.gif
index caab2147182..caab2147182 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/icons/full/wizban/NewElementtypesconfigurations.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewElementtypesconfigurations.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewTypes.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewTypes.gif
new file mode 100644
index 00000000000..d7a58977468
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewTypes.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewTypesConfigurations.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewTypesConfigurations.gif
new file mode 100644
index 00000000000..a6b42e7444a
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/icons/full/wizban/NewTypesConfigurations.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
index 19344385bc4..2cf10f2f34d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.properties
@@ -62,3 +62,24 @@ _UI_Wizard_initial_object_description = Select a model object to create
 _UI_FileConflict_label = File Conflict

 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

 

+_UI_TypesEditor_menu = &Types Editor

+
_UI_TypesModelWizard_label = Types Model

+_UI_TypesModelWizard_description = Create a new Types model

+
_UI_TypesEditor_label = Types Model Editor

+
_UI_TypesEditorFilenameDefaultBase = My

+_UI_TypesEditorFilenameExtensions = types

+


+_UI_TypesConfigurationsEditor_menu = &TypesConfigurations Editor

+
_UI_TypesConfigurationsModelWizard_label = TypesConfigurations Model

+_UI_TypesConfigurationsModelWizard_description = Create a new TypesConfigurations model

+
_UI_TypesConfigurationsEditor_label = TypesConfigurations Model Editor

+
_UI_TypesConfigurationsEditorFilenameDefaultBase = My

+_UI_TypesConfigurationsEditorFilenameExtensions = typesconfigurations

+


+_UI_ElementTypesConfigurationsEditor_menu = &ElementTypesConfigurations Editor

+
_UI_ElementTypesConfigurationsModelWizard_label = ElementTypesConfigurations Model

+_UI_ElementTypesConfigurationsModelWizard_description = Create a new ElementTypesConfigurations model

+
_UI_ElementTypesConfigurationsEditor_label = ElementTypesConfigurations Model Editor

+
_UI_ElementTypesConfigurationsEditorFilenameDefaultBase = My

+_UI_ElementTypesConfigurationsEditorFilenameExtensions = elementtypesconfigurations

+


diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml
index 713f14fee43..609a7d08438 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/plugin.xml
@@ -16,18 +16,20 @@
 

 <plugin>

 

+

+
    <extension point="org.eclipse.ui.newWizards">

       <!-- @generated ElementTypesConfigurations -->

       <category

             id="org.eclipse.emf.ecore.Wizard.category.ID"

             name="%_UI_Wizard_category"/>

       <wizard

-            id="org.eclipse.papyrus.infra.elementtypesconfigurations.presentation.ElementtypesconfigurationsModelWizardID"

-            name="%_UI_ElementtypesconfigurationsModelWizard_label"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.presentation.ElementtypesconfigurationsModelWizard"

+            id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizardID"

+            name="%_UI_ElementTypesConfigurationsModelWizard_label"

+            class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsModelWizard"

             category="org.eclipse.emf.ecore.Wizard.category.ID"

-            icon="icons/full/obj16/ElementtypesconfigurationsModelFile.gif">

-         <description>%_UI_ElementtypesconfigurationsModelWizard_description</description>

+            icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif">

+         <description>%_UI_ElementTypesConfigurationsModelWizard_description</description>

          <selection class="org.eclipse.core.resources.IResource"/>

       </wizard>

    </extension>

@@ -35,13 +37,12 @@
    <extension point="org.eclipse.ui.editors">

       <!-- @generated ElementTypesConfigurations -->

       <editor

-            id="org.eclipse.papyrus.infra.elementtypesconfigurations.presentation.ElementtypesconfigurationsEditorID"

-            name="%_UI_ElementtypesconfigurationsEditor_label"

-            icon="icons/full/obj16/ElementtypesconfigurationsModelFile.gif"

-            class="org.eclipse.papyrus.infra.elementtypesconfigurations.presentation.ElementtypesconfigurationsEditor"

-            contributorClass="org.eclipse.papyrus.infra.elementtypesconfigurations.presentation.ElementtypesconfigurationsActionBarContributor">

-         <contentTypeBinding contentTypeId="org.eclipse.papyrus.infra.elementtypesconfigurations"/>

+            id="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditorID"

+            name="%_UI_ElementTypesConfigurationsEditor_label"

+            icon="icons/full/obj16/ElementTypesConfigurationsModelFile.gif"

+            class="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsEditor"

+            contributorClass="org.eclipse.papyrus.infra.types.presentation.ElementTypesConfigurationsActionBarContributor">

+         <contentTypeBinding contentTypeId="org.eclipse.papyrus.infra.types"/>

       </editor>

    </extension>

-

 </plugin>

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml
new file mode 100644
index 00000000000..bd708807baf
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-types</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.types.editor</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementtypesconfigurationsActionBarContributor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/ElementTypesConfigurationsActionBarContributor.java
index a98ea7f35e2..ada3a30f3ec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementtypesconfigurationsActionBarContributor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/ElementTypesConfigurationsActionBarContributor.java
@@ -1,433 +1,433 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.presentation;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-

-import org.eclipse.emf.edit.ui.action.ControlAction;

-import org.eclipse.emf.edit.ui.action.CreateChildAction;

-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.action.LoadResourceAction;

-import org.eclipse.emf.edit.ui.action.ValidateAction;

-

-import org.eclipse.jface.action.Action;

-import org.eclipse.jface.action.ActionContributionItem;

-import org.eclipse.jface.action.IAction;

-import org.eclipse.jface.action.IContributionItem;

-import org.eclipse.jface.action.IContributionManager;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.action.SubContributionItem;

-

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.Viewer;

-

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.PartInitException;

-

-/**

- * This is the action bar contributor for the Elementtypesconfigurations model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ElementtypesconfigurationsActionBarContributor

-	extends EditingDomainActionBarContributor

-	implements ISelectionChangedListener {

-	/**

-	 * This keeps track of the active editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IEditorPart activeEditorPart;

-

-	/**

-	 * This keeps track of the current selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ISelectionProvider selectionProvider;

-

-	/**

-	 * This action opens the Properties view.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction showPropertiesViewAction =

-		new Action(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

-			@Override

-			public void run() {

-				try {

-					getPage().showView("org.eclipse.ui.views.PropertySheet");

-				}

-				catch (PartInitException exception) {

-					ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-		};

-

-	/**

-	 * This action refreshes the viewer of the current editor if the editor

-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IAction refreshViewerAction =

-		new Action(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

-			@Override

-			public boolean isEnabled() {

-				return activeEditorPart instanceof IViewerProvider;

-			}

-

-			@Override

-			public void run() {

-				if (activeEditorPart instanceof IViewerProvider) {

-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

-					if (viewer != null) {

-						viewer.refresh();

-					}

-				}

-			}

-		};

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createChildActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createChildMenuManager;

-

-	/**

-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

-	 * generated for the current selection by the item provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> createSiblingActions;

-

-	/**

-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IMenuManager createSiblingMenuManager;

-

-	/**

-	 * This creates an instance of the contributor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ElementtypesconfigurationsActionBarContributor() {

-		super(ADDITIONS_LAST_STYLE);

-		loadResourceAction = new LoadResourceAction();

-		validateAction = new ValidateAction();

-		controlAction = new ControlAction();

-	}

-

-	/**

-	 * This adds Separators for editor additions to the tool bar.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToToolBar(IToolBarManager toolBarManager) {

-		toolBarManager.add(new Separator("elementtypesconfigurations-settings"));

-		toolBarManager.add(new Separator("elementtypesconfigurations-additions"));

-	}

-

-	/**

-	 * This adds to the menu bar a menu and some separators for editor additions,

-	 * as well as the sub-menus for object creation items.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void contributeToMenu(IMenuManager menuManager) {

-		super.contributeToMenu(menuManager);

-

-		IMenuManager submenuManager = new MenuManager(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsEditor_menu"), "org.eclipse.papyrus.infra.elementtypesconfigurationsMenuID");

-		menuManager.insertAfter("additions", submenuManager);

-		submenuManager.add(new Separator("settings"));

-		submenuManager.add(new Separator("actions"));

-		submenuManager.add(new Separator("additions"));

-		submenuManager.add(new Separator("additions-end"));

-

-		// Prepare for CreateChild item addition or removal.

-		//

-		createChildMenuManager = new MenuManager(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		submenuManager.insertBefore("additions", createChildMenuManager);

-

-		// Prepare for CreateSibling item addition or removal.

-		//

-		createSiblingMenuManager = new MenuManager(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		submenuManager.insertBefore("additions", createSiblingMenuManager);

-

-		// Force an update because Eclipse hides empty menus now.

-		//

-		submenuManager.addMenuListener

-			(new IMenuListener() {

-				 public void menuAboutToShow(IMenuManager menuManager) {

-					 menuManager.updateAll(true);

-				 }

-			 });

-

-		addGlobalActions(submenuManager);

-	}

-

-	/**

-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void setActiveEditor(IEditorPart part) {

-		super.setActiveEditor(part);

-		activeEditorPart = part;

-

-		// Switch to the new selection provider.

-		//

-		if (selectionProvider != null) {

-			selectionProvider.removeSelectionChangedListener(this);

-		}

-		if (part == null) {

-			selectionProvider = null;

-		}

-		else {

-			selectionProvider = part.getSite().getSelectionProvider();

-			selectionProvider.addSelectionChangedListener(this);

-

-			// Fake a selection changed event to update the menus.

-			//

-			if (selectionProvider.getSelection() != null) {

-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

-			}

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

-	 * that can be added to the selected object and updating the menus accordingly.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void selectionChanged(SelectionChangedEvent event) {

-		// Remove any menu items for old selection.

-		//

-		if (createChildMenuManager != null) {

-			depopulateManager(createChildMenuManager, createChildActions);

-		}

-		if (createSiblingMenuManager != null) {

-			depopulateManager(createSiblingMenuManager, createSiblingActions);

-		}

-

-		// Query the new selection for appropriate new child/sibling descriptors

-		//

-		Collection<?> newChildDescriptors = null;

-		Collection<?> newSiblingDescriptors = null;

-

-		ISelection selection = event.getSelection();

-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

-			Object object = ((IStructuredSelection)selection).getFirstElement();

-

-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

-

-			newChildDescriptors = domain.getNewChildDescriptors(object, null);

-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

-		}

-

-		// Generate actions for selection; populate and redraw the menus.

-		//

-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

-

-		if (createChildMenuManager != null) {

-			populateManager(createChildMenuManager, createChildActions, null);

-			createChildMenuManager.update(true);

-		}

-		if (createSiblingMenuManager != null) {

-			populateManager(createSiblingMenuManager, createSiblingActions, null);

-			createSiblingMenuManager.update(true);

-		}

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

-	 * and returns the collection of these actions.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

-		Collection<IAction> actions = new ArrayList<IAction>();

-		if (descriptors != null) {

-			for (Object descriptor : descriptors) {

-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

-			}

-		}

-		return actions;

-	}

-

-	/**

-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

-	 * by inserting them before the specified contribution item <code>contributionID</code>.

-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

-		if (actions != null) {

-			for (IAction action : actions) {

-				if (contributionID != null) {

-					manager.insertBefore(contributionID, action);

-				}

-				else {

-					manager.add(action);

-				}

-			}

-		}

-	}

-		

-	/**

-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

-		if (actions != null) {

-			IContributionItem[] items = manager.getItems();

-			for (int i = 0; i < items.length; i++) {

-				// Look into SubContributionItems

-				//

-				IContributionItem contributionItem = items[i];

-				while (contributionItem instanceof SubContributionItem) {

-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

-				}

-

-				// Delete the ActionContributionItems with matching action.

-				//

-				if (contributionItem instanceof ActionContributionItem) {

-					IAction action = ((ActionContributionItem)contributionItem).getAction();

-					if (actions.contains(action)) {

-						manager.remove(contributionItem);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This populates the pop-up menu before it appears.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void menuAboutToShow(IMenuManager menuManager) {

-		super.menuAboutToShow(menuManager);

-		MenuManager submenuManager = null;

-

-		submenuManager = new MenuManager(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

-		populateManager(submenuManager, createChildActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-

-		submenuManager = new MenuManager(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

-		populateManager(submenuManager, createSiblingActions, null);

-		menuManager.insertBefore("edit", submenuManager);

-	}

-

-	/**

-	 * This inserts global actions before the "additions-end" separator.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void addGlobalActions(IMenuManager menuManager) {

-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

-

-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

-		menuManager.insertAfter("ui-actions", refreshViewerAction);

-

-		super.addGlobalActions(menuManager);

-	}

-

-	/**

-	 * This ensures that a delete action will clean up all references to deleted objects.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected boolean removeAllReferencesOnDelete() {

-		return true;

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the ElementTypesConfigurations model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ElementTypesConfigurationsActionBarContributor
+	extends EditingDomainActionBarContributor
+	implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+		new Action(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet");
+				}
+				catch (PartInitException exception) {
+					TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+		new Action(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ElementTypesConfigurationsActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("elementtypesconfigurations-settings"));
+		toolBarManager.add(new Separator("elementtypesconfigurations-additions"));
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsEditor_menu"), "org.eclipse.papyrus.infra.typesMenuID");
+		menuManager.insertAfter("additions", submenuManager);
+		submenuManager.add(new Separator("settings"));
+		submenuManager.add(new Separator("actions"));
+		submenuManager.add(new Separator("additions"));
+		submenuManager.add(new Separator("additions-end"));
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager.insertBefore("additions", createChildMenuManager);
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+		
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager);
+
+		submenuManager = new MenuManager(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager);
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementtypesconfigurationsEditor.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/ElementTypesConfigurationsEditor.java
index 88785642353..3a96faff476 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementtypesconfigurationsEditor.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/ElementTypesConfigurationsEditor.java
@@ -1,1868 +1,1829 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.presentation;

-

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.EventObject;

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.LinkedHashMap;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IMarker;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IResourceChangeEvent;

-import org.eclipse.core.resources.IResourceChangeListener;

-import org.eclipse.core.resources.IResourceDelta;

-import org.eclipse.core.resources.IResourceDeltaVisitor;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.common.command.CommandStack;

-import org.eclipse.emf.common.command.CommandStackListener;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.ui.MarkerHelper;

-import org.eclipse.emf.common.ui.ViewerPane;

-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

-import org.eclipse.emf.common.ui.viewer.IViewerProvider;

-import org.eclipse.emf.common.util.BasicDiagnostic;

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.util.EContentAdapter;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.edit.domain.IEditingDomainProvider;

-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

-import org.eclipse.emf.edit.ui.util.EditUIUtil;

-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

-import org.eclipse.jface.action.IMenuListener;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.IToolBarManager;

-import org.eclipse.jface.action.MenuManager;

-import org.eclipse.jface.action.Separator;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.util.LocalSelectionTransfer;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.ISelectionChangedListener;

-import org.eclipse.jface.viewers.ISelectionProvider;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.jface.viewers.ListViewer;

-import org.eclipse.jface.viewers.SelectionChangedEvent;

-import org.eclipse.jface.viewers.StructuredSelection;

-import org.eclipse.jface.viewers.StructuredViewer;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.TreeViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementtypesconfigurationsItemProviderAdapterFactory;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.CTabFolder;

-import org.eclipse.swt.dnd.DND;

-import org.eclipse.swt.dnd.FileTransfer;

-import org.eclipse.swt.dnd.Transfer;

-import org.eclipse.swt.events.ControlAdapter;

-import org.eclipse.swt.events.ControlEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.FillLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Menu;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.swt.widgets.TreeColumn;

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IEditorInput;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IEditorSite;

-import org.eclipse.ui.IPartListener;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PartInitException;

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-import org.eclipse.ui.dialogs.SaveAsDialog;

-import org.eclipse.ui.ide.IGotoMarker;

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.MultiPageEditorPart;

-import org.eclipse.ui.views.contentoutline.ContentOutline;

-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

-import org.eclipse.ui.views.properties.IPropertySheetPage;

-import org.eclipse.ui.views.properties.PropertySheet;

-import org.eclipse.ui.views.properties.PropertySheetPage;

-

-

-/**

- * This is an example of a Elementtypesconfigurations model editor.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * 

- * @generated

- */

-public class ElementtypesconfigurationsEditor

-		extends MultiPageEditorPart

-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

-	/**

-	 * This keeps track of the editing domain that is used to track all changes to the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected AdapterFactoryEditingDomain editingDomain;

-

-	/**

-	 * This is the one adapter factory used for providing views of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ComposedAdapterFactory adapterFactory;

-

-	/**

-	 * This is the content outline page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected IContentOutlinePage contentOutlinePage;

-

-	/**

-	 * This is a kludge...

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected IStatusLineManager contentOutlineStatusLineManager;

-

-	/**

-	 * This is the content outline page's viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TreeViewer contentOutlineViewer;

-

-	/**

-	 * This is the property sheet page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

-

-	/**

-	 * This is the viewer that shadows the selection in the content outline.

-	 * The parent relation must be correctly defined for this to work.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TreeViewer selectionViewer;

-

-	/**

-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TreeViewer parentViewer;

-

-	/**

-	 * This shows how a tree view works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TreeViewer treeViewer;

-

-	/**

-	 * This shows how a list view works.

-	 * A list viewer doesn't support icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ListViewer listViewer;

-

-	/**

-	 * This shows how a table view works.

-	 * A table can be used as a list with icons.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TableViewer tableViewer;

-

-	/**

-	 * This shows how a tree view with columns works.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TreeViewer treeViewerWithColumns;

-

-	/**

-	 * This keeps track of the active viewer pane, in the book.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ViewerPane currentViewerPane;

-

-	/**

-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected Viewer currentViewer;

-

-	/**

-	 * This listens to which ever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ISelectionChangedListener selectionChangedListener;

-

-	/**

-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

-

-	/**

-	 * This keeps track of the selection of the editor as a whole.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ISelection editorSelection = StructuredSelection.EMPTY;

-

-	/**

-	 * The MarkerHelper is responsible for creating workspace resource markers presented

-	 * in Eclipse's Problems View.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

-

-	/**

-	 * This listens for when the outline becomes active

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected IPartListener partListener =

-			new IPartListener() {

-				public void partActivated(IWorkbenchPart p) {

-					if (p instanceof ContentOutline) {

-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {

-							getActionBarContributor().setActiveEditor(ElementtypesconfigurationsEditor.this);

-

-							setCurrentViewer(contentOutlineViewer);

-						}

-					}

-					else if (p instanceof PropertySheet) {

-						if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {

-							getActionBarContributor().setActiveEditor(ElementtypesconfigurationsEditor.this);

-							handleActivate();

-						}

-					}

-					else if (p == ElementtypesconfigurationsEditor.this) {

-						handleActivate();

-					}

-				}

-

-				public void partBroughtToTop(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partClosed(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partDeactivated(IWorkbenchPart p) {

-					// Ignore.

-				}

-

-				public void partOpened(IWorkbenchPart p) {

-					// Ignore.

-				}

-			};

-

-	/**

-	 * Resources that have been removed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been changed since last activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected Collection<Resource> changedResources = new ArrayList<Resource>();

-

-	/**

-	 * Resources that have been saved.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected Collection<Resource> savedResources = new ArrayList<Resource>();

-

-	/**

-	 * Map to store the diagnostic associated with a resource.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

-

-	/**

-	 * Controls whether the problem indication should be updated.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected boolean updateProblemIndication = true;

-

-	/**

-	 * Adapter used to update the problem indication when resources are demanded loaded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected EContentAdapter problemIndicationAdapter =

-			new EContentAdapter() {

-				@Override

-				public void notifyChanged(Notification notification) {

-					if (notification.getNotifier() instanceof Resource) {

-						switch (notification.getFeatureID(Resource.class)) {

-						case Resource.RESOURCE__IS_LOADED:

-						case Resource.RESOURCE__ERRORS:

-						case Resource.RESOURCE__WARNINGS: {

-							Resource resource = (Resource) notification.getNotifier();

-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

-							if (diagnostic.getSeverity() != Diagnostic.OK) {

-								resourceToDiagnosticMap.put(resource, diagnostic);

-							}

-							else {

-								resourceToDiagnosticMap.remove(resource);

-							}

-

-							if (updateProblemIndication) {

-								getSite().getShell().getDisplay().asyncExec

-										(new Runnable() {

-											public void run() {

-												updateProblemIndication();

-											}

-										});

-							}

-							break;

-						}

-						}

-					}

-					else {

-						super.notifyChanged(notification);

-					}

-				}

-

-				@Override

-				protected void setTarget(Resource target) {

-					basicSetTarget(target);

-				}

-

-				@Override

-				protected void unsetTarget(Resource target) {

-					basicUnsetTarget(target);

-					resourceToDiagnosticMap.remove(target);

-					if (updateProblemIndication) {

-						getSite().getShell().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										updateProblemIndication();

-									}

-								});

-					}

-				}

-			};

-

-	/**

-	 * This listens for workspace changes.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected IResourceChangeListener resourceChangeListener =

-			new IResourceChangeListener() {

-				public void resourceChanged(IResourceChangeEvent event) {

-					IResourceDelta delta = event.getDelta();

-					try {

-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {

-							protected ResourceSet resourceSet = editingDomain.getResourceSet();

-							protected Collection<Resource> changedResources = new ArrayList<Resource>();

-							protected Collection<Resource> removedResources = new ArrayList<Resource>();

-

-							public boolean visit(IResourceDelta delta) {

-								if (delta.getResource().getType() == IResource.FILE) {

-									if (delta.getKind() == IResourceDelta.REMOVED ||

-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

-										if (resource != null) {

-											if (delta.getKind() == IResourceDelta.REMOVED) {

-												removedResources.add(resource);

-											}

-											else if (!savedResources.remove(resource)) {

-												changedResources.add(resource);

-											}

-										}

-									}

-									return false;

-								}

-

-								return true;

-							}

-

-							public Collection<Resource> getChangedResources() {

-								return changedResources;

-							}

-

-							public Collection<Resource> getRemovedResources() {

-								return removedResources;

-							}

-						}

-

-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

-						delta.accept(visitor);

-

-						if (!visitor.getRemovedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											removedResources.addAll(visitor.getRemovedResources());

-											if (!isDirty()) {

-												getSite().getPage().closeEditor(ElementtypesconfigurationsEditor.this, false);

-											}

-										}

-									});

-						}

-

-						if (!visitor.getChangedResources().isEmpty()) {

-							getSite().getShell().getDisplay().asyncExec

-									(new Runnable() {

-										public void run() {

-											changedResources.addAll(visitor.getChangedResources());

-											if (getSite().getPage().getActiveEditor() == ElementtypesconfigurationsEditor.this) {

-												handleActivate();

-											}

-										}

-									});

-						}

-					}

-					catch (CoreException exception) {

-						ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			};

-

-	/**

-	 * Handles activation of the editor or it's associated views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void handleActivate() {

-		// Recompute the read only state.

-		//

-		if (editingDomain.getResourceToReadOnlyMap() != null) {

-			editingDomain.getResourceToReadOnlyMap().clear();

-

-			// Refresh any actions that may become enabled or disabled.

-			//

-			setSelection(getSelection());

-		}

-

-		if (!removedResources.isEmpty()) {

-			if (handleDirtyConflict()) {

-				getSite().getPage().closeEditor(ElementtypesconfigurationsEditor.this, false);

-			}

-			else {

-				removedResources.clear();

-				changedResources.clear();

-				savedResources.clear();

-			}

-		}

-		else if (!changedResources.isEmpty()) {

-			changedResources.removeAll(savedResources);

-			handleChangedResources();

-			changedResources.clear();

-			savedResources.clear();

-		}

-	}

-

-	/**

-	 * Handles what to do with changed resources on activation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void handleChangedResources() {

-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

-			if (isDirty()) {

-				changedResources.addAll(editingDomain.getResourceSet().getResources());

-			}

-			editingDomain.getCommandStack().flush();

-

-			updateProblemIndication = false;

-			for (Resource resource : changedResources) {

-				if (resource.isLoaded()) {

-					resource.unload();

-					try {

-						resource.load(Collections.EMPTY_MAP);

-					} catch (IOException exception) {

-						if (!resourceToDiagnosticMap.containsKey(resource)) {

-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-						}

-					}

-				}

-			}

-

-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

-				setSelection(StructuredSelection.EMPTY);

-			}

-

-			updateProblemIndication = true;

-			updateProblemIndication();

-		}

-	}

-

-	/**

-	 * Updates the problems indication with the information described in the specified diagnostic.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void updateProblemIndication() {

-		if (updateProblemIndication) {

-			BasicDiagnostic diagnostic =

-					new BasicDiagnostic

-					(Diagnostic.OK,

-							"org.eclipse.papyrus.infra.elementtypesconfigurations.editor",

-							0,

-							null,

-							new Object[] { editingDomain.getResourceSet() });

-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

-					diagnostic.add(childDiagnostic);

-				}

-			}

-

-			int lastEditorPage = getPageCount() - 1;

-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					setActivePage(lastEditorPage);

-				}

-			}

-			else if (diagnostic.getSeverity() != Diagnostic.OK) {

-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

-				problemEditorPart.setDiagnostic(diagnostic);

-				problemEditorPart.setMarkerHelper(markerHelper);

-				try {

-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

-					setPageText(lastEditorPage, problemEditorPart.getPartName());

-					setActivePage(lastEditorPage);

-					showTabs();

-				} catch (PartInitException exception) {

-					ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-				}

-			}

-

-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

-				markerHelper.deleteMarkers(editingDomain.getResourceSet());

-				if (diagnostic.getSeverity() != Diagnostic.OK) {

-					try {

-						markerHelper.createMarkers(diagnostic);

-					} catch (CoreException exception) {

-						ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * Shows a dialog that asks if conflicting changes should be discarded.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected boolean handleDirtyConflict() {

-		return MessageDialog.openQuestion

-				(getSite().getShell(),

-						getString("_UI_FileConflict_label"),

-						getString("_WARN_FileConflict"));

-	}

-

-	/**

-	 * This creates a model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ElementtypesconfigurationsEditor() {

-		super();

-		initializeEditingDomain();

-	}

-

-	/**

-	 * This sets up the editing domain for the model editor.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void initializeEditingDomain() {

-		// Create an adapter factory that yields item providers.

-		//

-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-

-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ElementtypesconfigurationsItemProviderAdapterFactory());

-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

-

-		// Create the command stack that will notify this editor as commands are executed.

-		//

-		BasicCommandStack commandStack = new BasicCommandStack();

-

-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

-		//

-		commandStack.addCommandStackListener

-				(new CommandStackListener() {

-					public void commandStackChanged(final EventObject event) {

-						getContainer().getDisplay().asyncExec

-								(new Runnable() {

-									public void run() {

-										firePropertyChange(IEditorPart.PROP_DIRTY);

-

-										// Try to select the affected objects.

-										//

-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();

-										if (mostRecentCommand != null) {

-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());

-										}

-										for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {

-											PropertySheetPage propertySheetPage = i.next();

-											if (propertySheetPage.getControl().isDisposed()) {

-												i.remove();

-											}

-											else {

-												propertySheetPage.refresh();

-											}

-										}

-									}

-								});

-					}

-				});

-

-		// Create the editing domain with a special command stack.

-		//

-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

-	}

-

-	/**

-	 * This is here for the listener to be able to call it.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected void firePropertyChange(int action) {

-		super.firePropertyChange(action);

-	}

-

-	/**

-	 * This sets the selection into whichever viewer is active.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setSelectionToViewer(Collection<?> collection) {

-		final Collection<?> theSelection = collection;

-		// Make sure it's okay.

-		//

-		if (theSelection != null && !theSelection.isEmpty()) {

-			Runnable runnable =

-					new Runnable() {

-						public void run() {

-							// Try to select the items in the current content viewer of the editor.

-							//

-							if (currentViewer != null) {

-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

-							}

-						}

-					};

-			getSite().getShell().getDisplay().asyncExec(runnable);

-		}

-	}

-

-	/**

-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EditingDomain getEditingDomain() {

-		return editingDomain;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

-			super(adapterFactory);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		@Override

-		public Object[] getElements(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		@Override

-		public Object[] getChildren(Object object) {

-			Object parent = super.getParent(object);

-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		@Override

-		public boolean hasChildren(Object object) {

-			Object parent = super.getParent(object);

-			return parent != null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		@Override

-		public Object getParent(Object object) {

-			return null;

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setCurrentViewerPane(ViewerPane viewerPane) {

-		if (currentViewerPane != viewerPane) {

-			if (currentViewerPane != null) {

-				currentViewerPane.showFocus(false);

-			}

-			currentViewerPane = viewerPane;

-		}

-		setCurrentViewer(currentViewerPane.getViewer());

-	}

-

-	/**

-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

-	 * is the current one.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setCurrentViewer(Viewer viewer) {

-		// If it is changing...

-		//

-		if (currentViewer != viewer) {

-			if (selectionChangedListener == null) {

-				// Create the listener on demand.

-				//

-				selectionChangedListener =

-						new ISelectionChangedListener() {

-							// This just notifies those things that are affected by the section.

-							//

-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

-								setSelection(selectionChangedEvent.getSelection());

-							}

-						};

-			}

-

-			// Stop listening to the old one.

-			//

-			if (currentViewer != null) {

-				currentViewer.removeSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Start listening to the new one.

-			//

-			if (viewer != null) {

-				viewer.addSelectionChangedListener(selectionChangedListener);

-			}

-

-			// Remember it.

-			//

-			currentViewer = viewer;

-

-			// Set the editors selection based on the current viewer's selection.

-			//

-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

-		}

-	}

-

-	/**

-	 * This returns the viewer as required by the {@link IViewerProvider} interface.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Viewer getViewer() {

-		return currentViewer;

-	}

-

-	/**

-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void createContextMenuFor(StructuredViewer viewer) {

-		MenuManager contextMenu = new MenuManager("#PopUp");

-		contextMenu.add(new Separator("additions"));

-		contextMenu.setRemoveAllWhenShown(true);

-		contextMenu.addMenuListener(this);

-		Menu menu = contextMenu.createContextMenu(viewer.getControl());

-		viewer.getControl().setMenu(menu);

-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

-

-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

-	}

-

-	/**

-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void createModel() {

-		URI resourceURI = EditUIUtil.getURI(getEditorInput());

-		Exception exception = null;

-		Resource resource = null;

-		try {

-			// Load the resource through the editing domain.

-			//

-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

-		} catch (Exception e) {

-			exception = e;

-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

-		}

-

-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

-		if (diagnostic.getSeverity() != Diagnostic.OK) {

-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-		}

-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

-	}

-

-	/**

-	 * Returns a diagnostic describing the errors and warnings listed in the resource

-	 * and the specified exception (if any).

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

-			BasicDiagnostic basicDiagnostic =

-					new BasicDiagnostic

-					(Diagnostic.ERROR,

-							"org.eclipse.papyrus.infra.elementtypesconfigurations.editor",

-							0,

-							getString("_UI_CreateModelError_message", resource.getURI()),

-							new Object[] { exception == null ? (Object) resource : exception });

-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

-			return basicDiagnostic;

-		}

-		else if (exception != null) {

-			return new BasicDiagnostic(Diagnostic.ERROR,

-					"org.eclipse.papyrus.infra.elementtypesconfigurations.editor",

-					0,

-					getString("_UI_CreateModelError_message", resource.getURI()),

-					new Object[] { exception });

-		}

-		else {

-			return Diagnostic.OK_INSTANCE;

-		}

-	}

-

-	/**

-	 * This is the method used by the framework to install your own controls.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void createPages() {

-		// Creates the model from the editor input

-		//

-		createModel();

-

-		// Only creates the other pages if there is something that can be edited

-		//

-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

-			// Create a page for the selection tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ElementtypesconfigurationsEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				selectionViewer = (TreeViewer) viewerPane.getViewer();

-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-

-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-				selectionViewer.setInput(editingDomain.getResourceSet());

-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-				viewerPane.setTitle(editingDomain.getResourceSet());

-

-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(selectionViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

-			}

-

-			// Create a page for the parent tree view.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ElementtypesconfigurationsEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								Tree tree = new Tree(composite, SWT.MULTI);

-								TreeViewer newTreeViewer = new TreeViewer(tree);

-								return newTreeViewer;

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				parentViewer = (TreeViewer) viewerPane.getViewer();

-				parentViewer.setAutoExpandLevel(30);

-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(parentViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ParentPage_label"));

-			}

-

-			// This is the page for the list viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ElementtypesconfigurationsEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new ListViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				listViewer = (ListViewer) viewerPane.getViewer();

-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(listViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_ListPage_label"));

-			}

-

-			// This is the page for the tree viewer

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ElementtypesconfigurationsEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				treeViewer = (TreeViewer) viewerPane.getViewer();

-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

-

-				createContextMenuFor(treeViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreePage_label"));

-			}

-

-			// This is the page for the table viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ElementtypesconfigurationsEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TableViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-				tableViewer = (TableViewer) viewerPane.getViewer();

-

-				Table table = tableViewer.getTable();

-				TableLayout layout = new TableLayout();

-				table.setLayout(layout);

-				table.setHeaderVisible(true);

-				table.setLinesVisible(true);

-

-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(3, 100, true));

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-

-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

-				layout.addColumnData(new ColumnWeightData(2, 100, true));

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-

-				tableViewer.setColumnProperties(new String[] { "a", "b" });

-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(tableViewer);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TablePage_label"));

-			}

-

-			// This is the page for the table tree viewer.

-			//

-			{

-				ViewerPane viewerPane =

-						new ViewerPane(getSite().getPage(), ElementtypesconfigurationsEditor.this) {

-							@Override

-							public Viewer createViewer(Composite composite) {

-								return new TreeViewer(composite);

-							}

-

-							@Override

-							public void requestActivation() {

-								super.requestActivation();

-								setCurrentViewerPane(this);

-							}

-						};

-				viewerPane.createControl(getContainer());

-

-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();

-

-				Tree tree = treeViewerWithColumns.getTree();

-				tree.setLayoutData(new FillLayout());

-				tree.setHeaderVisible(true);

-				tree.setLinesVisible(true);

-

-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

-				objectColumn.setText(getString("_UI_ObjectColumn_label"));

-				objectColumn.setResizable(true);

-				objectColumn.setWidth(250);

-

-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

-				selfColumn.setText(getString("_UI_SelfColumn_label"));

-				selfColumn.setResizable(true);

-				selfColumn.setWidth(200);

-

-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });

-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-

-				createContextMenuFor(treeViewerWithColumns);

-				int pageIndex = addPage(viewerPane.getControl());

-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

-			}

-

-			getSite().getShell().getDisplay().asyncExec

-					(new Runnable() {

-						public void run() {

-							setActivePage(0);

-						}

-					});

-		}

-

-		// Ensures that this editor will only display the page's tab

-		// area if there are more than one page

-		//

-		getContainer().addControlListener

-				(new ControlAdapter() {

-					boolean guard = false;

-

-					@Override

-					public void controlResized(ControlEvent event) {

-						if (!guard) {

-							guard = true;

-							hideTabs();

-							guard = false;

-						}

-					}

-				});

-

-		getSite().getShell().getDisplay().asyncExec

-				(new Runnable() {

-					public void run() {

-						updateProblemIndication();

-					}

-				});

-	}

-

-	/**

-	 * If there is just one page in the multi-page editor part,

-	 * this hides the single tab at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void hideTabs() {

-		if (getPageCount() <= 1) {

-			setPageText(0, "");

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(1);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y + 6);

-			}

-		}

-	}

-

-	/**

-	 * If there is more than one page in the multi-page editor part,

-	 * this shows the tabs at the bottom.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void showTabs() {

-		if (getPageCount() > 1) {

-			setPageText(0, getString("_UI_SelectionPage_label"));

-			if (getContainer() instanceof CTabFolder) {

-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);

-				Point point = getContainer().getSize();

-				getContainer().setSize(point.x, point.y - 6);

-			}

-		}

-	}

-

-	/**

-	 * This is used to track the active viewer.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected void pageChange(int pageIndex) {

-		super.pageChange(pageIndex);

-

-		if (contentOutlinePage != null) {

-			handleContentOutlineSelection(contentOutlinePage.getSelection());

-		}

-	}

-

-	/**

-	 * This is how the framework determines which interfaces we implement.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("rawtypes")

-	@Override

-	public Object getAdapter(Class key) {

-		if (key.equals(IContentOutlinePage.class)) {

-			return showOutlineView() ? getContentOutlinePage() : null;

-		}

-		else if (key.equals(IPropertySheetPage.class)) {

-			return getPropertySheetPage();

-		}

-		else if (key.equals(IGotoMarker.class)) {

-			return this;

-		}

-		else {

-			return super.getAdapter(key);

-		}

-	}

-

-	/**

-	 * This accesses a cached version of the content outliner.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public IContentOutlinePage getContentOutlinePage() {

-		if (contentOutlinePage == null) {

-			// The content outline is just a tree.

-			//

-			class MyContentOutlinePage extends ContentOutlinePage {

-				@Override

-				public void createControl(Composite parent) {

-					super.createControl(parent);

-					contentOutlineViewer = getTreeViewer();

-					contentOutlineViewer.addSelectionChangedListener(this);

-

-					// Set up the tree viewer.

-					//

-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

-					contentOutlineViewer.setInput(editingDomain.getResourceSet());

-

-					// Make sure our popups work.

-					//

-					createContextMenuFor(contentOutlineViewer);

-

-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

-						// Select the root object in the view.

-						//

-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

-					}

-				}

-

-				@Override

-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

-					super.makeContributions(menuManager, toolBarManager, statusLineManager);

-					contentOutlineStatusLineManager = statusLineManager;

-				}

-

-				@Override

-				public void setActionBars(IActionBars actionBars) {

-					super.setActionBars(actionBars);

-					getActionBarContributor().shareGlobalActions(this, actionBars);

-				}

-			}

-

-			contentOutlinePage = new MyContentOutlinePage();

-

-			// Listen to selection so that we can handle it is a special way.

-			//

-			contentOutlinePage.addSelectionChangedListener

-					(new ISelectionChangedListener() {

-						// This ensures that we handle selections correctly.

-						//

-						public void selectionChanged(SelectionChangedEvent event) {

-							handleContentOutlineSelection(event.getSelection());

-						}

-					});

-		}

-

-		return contentOutlinePage;

-	}

-

-	/**

-	 * This accesses a cached version of the property sheet.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public IPropertySheetPage getPropertySheetPage() {

-		PropertySheetPage propertySheetPage =

-				new ExtendedPropertySheetPage(editingDomain) {

-					@Override

-					public void setSelectionToViewer(List<?> selection) {

-						ElementtypesconfigurationsEditor.this.setSelectionToViewer(selection);

-						ElementtypesconfigurationsEditor.this.setFocus();

-					}

-

-					@Override

-					public void setActionBars(IActionBars actionBars) {

-						super.setActionBars(actionBars);

-						getActionBarContributor().shareGlobalActions(this, actionBars);

-					}

-				};

-		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

-		propertySheetPages.add(propertySheetPage);

-

-		return propertySheetPage;

-	}

-

-	/**

-	 * This deals with how we want selection in the outliner to affect the other views.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void handleContentOutlineSelection(ISelection selection) {

-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();

-			if (selectedElements.hasNext()) {

-				// Get the first selected element.

-				//

-				Object selectedElement = selectedElements.next();

-

-				// If it's the selection viewer, then we want it to select the same selection as this selection.

-				//

-				if (currentViewerPane.getViewer() == selectionViewer) {

-					ArrayList<Object> selectionList = new ArrayList<Object>();

-					selectionList.add(selectedElement);

-					while (selectedElements.hasNext()) {

-						selectionList.add(selectedElements.next());

-					}

-

-					// Set the selection to the widget.

-					//

-					selectionViewer.setSelection(new StructuredSelection(selectionList));

-				}

-				else {

-					// Set the input to the widget.

-					//

-					if (currentViewerPane.getViewer().getInput() != selectedElement) {

-						currentViewerPane.getViewer().setInput(selectedElement);

-						currentViewerPane.setTitle(selectedElement);

-					}

-				}

-			}

-		}

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean isDirty() {

-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();

-	}

-

-	/**

-	 * This is for implementing {@link IEditorPart} and simply saves the model file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void doSave(IProgressMonitor progressMonitor) {

-		// Save only resources that have actually changed.

-		//

-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

-		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

-

-		// Do the work within an operation because this is a long running activity that modifies the workbench.

-		//

-		WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					// This is the method that gets invoked when the operation runs.

-					//

-					@Override

-					public void execute(IProgressMonitor monitor) {

-						// Save the resources to the file system.

-						//

-						boolean first = true;

-						for (Resource resource : editingDomain.getResourceSet().getResources()) {

-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

-								try {

-									long timeStamp = resource.getTimeStamp();

-									resource.save(saveOptions);

-									if (resource.getTimeStamp() != timeStamp) {

-										savedResources.add(resource);

-									}

-								}

-								catch (Exception exception) {

-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

-								}

-								first = false;

-							}

-						}

-					}

-				};

-

-		updateProblemIndication = false;

-		try {

-			// This runs the options, and shows progress.

-			//

-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

-

-			// Refresh the necessary state.

-			//

-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();

-			firePropertyChange(IEditorPart.PROP_DIRTY);

-		} catch (Exception exception) {

-			// Something went wrong that shouldn't.

-			//

-			ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-		}

-		updateProblemIndication = true;

-		updateProblemIndication();

-	}

-

-	/**

-	 * This returns whether something has been persisted to the URI of the specified resource.

-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected boolean isPersisted(Resource resource) {

-		boolean result = false;

-		try {

-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

-			if (stream != null) {

-				result = true;

-				stream.close();

-			}

-		} catch (IOException e) {

-			// Ignore

-		}

-		return result;

-	}

-

-	/**

-	 * This always returns true because it is not currently supported.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean isSaveAsAllowed() {

-		return true;

-	}

-

-	/**

-	 * This also changes the editor's input.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void doSaveAs() {

-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

-		saveAsDialog.open();

-		IPath path = saveAsDialog.getResult();

-		if (path != null) {

-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

-			if (file != null) {

-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

-			}

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void doSaveAs(URI uri, IEditorInput editorInput) {

-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		IProgressMonitor progressMonitor =

-				getActionBars().getStatusLineManager() != null ?

-						getActionBars().getStatusLineManager().getProgressMonitor() :

-						new NullProgressMonitor();

-		doSave(progressMonitor);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void gotoMarker(IMarker marker) {

-		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

-		if (!targetObjects.isEmpty()) {

-			setSelectionToViewer(targetObjects);

-		}

-	}

-

-	/**

-	 * This is called during startup.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void init(IEditorSite site, IEditorInput editorInput) {

-		setSite(site);

-		setInputWithNotify(editorInput);

-		setPartName(editorInput.getName());

-		site.setSelectionProvider(this);

-		site.getPage().addPartListener(partListener);

-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void setFocus() {

-		if (currentViewerPane != null) {

-			currentViewerPane.setFocus();

-		}

-		else {

-			getControl(getActivePage()).setFocus();

-		}

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void addSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.add(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

-		selectionChangedListeners.remove(listener);

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ISelection getSelection() {

-		return editorSelection;

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

-	 * Calling this result will notify the listeners.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setSelection(ISelection selection) {

-		editorSelection = selection;

-

-		for (ISelectionChangedListener listener : selectionChangedListeners) {

-			listener.selectionChanged(new SelectionChangedEvent(this, selection));

-		}

-		setStatusLineManager(selection);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setStatusLineManager(ISelection selection) {

-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

-

-		if (statusLineManager != null) {

-			if (selection instanceof IStructuredSelection) {

-				Collection<?> collection = ((IStructuredSelection) selection).toList();

-				switch (collection.size()) {

-				case 0: {

-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

-					break;

-				}

-				case 1: {

-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

-					break;

-				}

-				default: {

-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

-					break;

-				}

-				}

-			}

-			else {

-				statusLineManager.setMessage("");

-			}

-		}

-	}

-

-	/**

-	 * This looks up a string in the plugin's plugin.properties file.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static String getString(String key) {

-		return ElementTypesConfigurationsEditorPlugin.INSTANCE.getString(key);

-	}

-

-	/**

-	 * This looks up a string in plugin.properties, making a substitution.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static String getString(String key, Object s1) {

-		return ElementTypesConfigurationsEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });

-	}

-

-	/**

-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void menuAboutToShow(IMenuManager menuManager) {

-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EditingDomainActionBarContributor getActionBarContributor() {

-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public IActionBars getActionBars() {

-		return getActionBarContributor().getActionBars();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public AdapterFactory getAdapterFactory() {

-		return adapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void dispose() {

-		updateProblemIndication = false;

-

-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

-

-		getSite().getPage().removePartListener(partListener);

-

-		adapterFactory.dispose();

-

-		if (getActionBarContributor().getActiveEditor() == this) {

-			getActionBarContributor().setActiveEditor(null);

-		}

-

-		for (PropertySheetPage propertySheetPage : propertySheetPages) {

-			propertySheetPage.dispose();

-		}

-

-		if (contentOutlinePage != null) {

-			contentOutlinePage.dispose();

-		}

-

-		super.dispose();

-	}

-

-	/**

-	 * Returns whether the outline view should be presented to the user.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected boolean showOutlineView() {

-		return true;

-	}

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.presentation;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+
+import org.eclipse.jface.util.LocalSelectionTransfer;
+
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.custom.CTabFolder;
+
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+
+import org.eclipse.swt.graphics.Point;
+
+import org.eclipse.swt.layout.FillLayout;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+
+import org.eclipse.ui.dialogs.SaveAsDialog;
+
+import org.eclipse.ui.ide.IGotoMarker;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiPageEditorPart;
+
+import org.eclipse.ui.views.contentoutline.ContentOutline;
+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+import org.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.ui.views.properties.PropertySheetPage;
+
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.ui.ViewerPane;
+
+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
+
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
+
+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
+
+import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+
+/**
+ * This is an example of a ElementTypesConfigurations model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ElementTypesConfigurationsEditor
+	extends MultiPageEditorPart
+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
+	/**
+	 * This keeps track of the editing domain that is used to track all changes to the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AdapterFactoryEditingDomain editingDomain;
+
+	/**
+	 * This is the one adapter factory used for providing views of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory adapterFactory;
+
+	/**
+	 * This is the content outline page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IContentOutlinePage contentOutlinePage;
+
+	/**
+	 * This is a kludge...
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStatusLineManager contentOutlineStatusLineManager;
+
+	/**
+	 * This is the content outline page's viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer contentOutlineViewer;
+
+	/**
+	 * This is the property sheet page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();
+
+	/**
+	 * This is the viewer that shadows the selection in the content outline.
+	 * The parent relation must be correctly defined for this to work.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer selectionViewer;
+
+	/**
+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer parentViewer;
+
+	/**
+	 * This shows how a tree view works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * This shows how a list view works.
+	 * A list viewer doesn't support icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListViewer listViewer;
+
+	/**
+	 * This shows how a table view works.
+	 * A table can be used as a list with icons.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableViewer tableViewer;
+
+	/**
+	 * This shows how a tree view with columns works.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TreeViewer treeViewerWithColumns;
+
+	/**
+	 * This keeps track of the active viewer pane, in the book.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ViewerPane currentViewerPane;
+
+	/**
+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Viewer currentViewer;
+
+	/**
+	 * This listens to which ever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionChangedListener selectionChangedListener;
+
+	/**
+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
+
+	/**
+	 * This keeps track of the selection of the editor as a whole.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelection editorSelection = StructuredSelection.EMPTY;
+
+	/**
+	 * The MarkerHelper is responsible for creating workspace resource markers presented
+	 * in Eclipse's Problems View.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
+
+	/**
+	 * This listens for when the outline becomes active
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IPartListener partListener =
+		new IPartListener() {
+			public void partActivated(IWorkbenchPart p) {
+				if (p instanceof ContentOutline) {
+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+						getActionBarContributor().setActiveEditor(ElementTypesConfigurationsEditor.this);
+
+						setCurrentViewer(contentOutlineViewer);
+					}
+				}
+				else if (p instanceof PropertySheet) {
+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {
+						getActionBarContributor().setActiveEditor(ElementTypesConfigurationsEditor.this);
+						handleActivate();
+					}
+				}
+				else if (p == ElementTypesConfigurationsEditor.this) {
+					handleActivate();
+				}
+			}
+			public void partBroughtToTop(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partClosed(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partDeactivated(IWorkbenchPart p) {
+				// Ignore.
+			}
+			public void partOpened(IWorkbenchPart p) {
+				// Ignore.
+			}
+		};
+
+	/**
+	 * Resources that have been removed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been changed since last activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> changedResources = new ArrayList<Resource>();
+
+	/**
+	 * Resources that have been saved.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Resource> savedResources = new ArrayList<Resource>();
+
+	/**
+	 * Map to store the diagnostic associated with a resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
+
+	/**
+	 * Controls whether the problem indication should be updated.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean updateProblemIndication = true;
+
+	/**
+	 * Adapter used to update the problem indication when resources are demanded loaded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EContentAdapter problemIndicationAdapter =
+		new EContentAdapter() {
+			@Override
+			public void notifyChanged(Notification notification) {
+				if (notification.getNotifier() instanceof Resource) {
+					switch (notification.getFeatureID(Resource.class)) {
+						case Resource.RESOURCE__IS_LOADED:
+						case Resource.RESOURCE__ERRORS:
+						case Resource.RESOURCE__WARNINGS: {
+							Resource resource = (Resource)notification.getNotifier();
+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+							if (diagnostic.getSeverity() != Diagnostic.OK) {
+								resourceToDiagnosticMap.put(resource, diagnostic);
+							}
+							else {
+								resourceToDiagnosticMap.remove(resource);
+							}
+
+							if (updateProblemIndication) {
+								getSite().getShell().getDisplay().asyncExec
+									(new Runnable() {
+										 public void run() {
+											 updateProblemIndication();
+										 }
+									 });
+							}
+							break;
+						}
+					}
+				}
+				else {
+					super.notifyChanged(notification);
+				}
+			}
+
+			@Override
+			protected void setTarget(Resource target) {
+				basicSetTarget(target);
+			}
+
+			@Override
+			protected void unsetTarget(Resource target) {
+				basicUnsetTarget(target);
+				resourceToDiagnosticMap.remove(target);
+				if (updateProblemIndication) {
+					getSite().getShell().getDisplay().asyncExec
+						(new Runnable() {
+							 public void run() {
+								 updateProblemIndication();
+							 }
+						 });
+				}
+			}
+		};
+
+	/**
+	 * This listens for workspace changes.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IResourceChangeListener resourceChangeListener =
+		new IResourceChangeListener() {
+			public void resourceChanged(IResourceChangeEvent event) {
+				IResourceDelta delta = event.getDelta();
+				try {
+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+						protected ResourceSet resourceSet = editingDomain.getResourceSet();
+						protected Collection<Resource> changedResources = new ArrayList<Resource>();
+						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+						public boolean visit(IResourceDelta delta) {
+							if (delta.getResource().getType() == IResource.FILE) {
+								if (delta.getKind() == IResourceDelta.REMOVED ||
+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+									if (resource != null) {
+										if (delta.getKind() == IResourceDelta.REMOVED) {
+											removedResources.add(resource);
+										}
+										else if (!savedResources.remove(resource)) {
+											changedResources.add(resource);
+										}
+									}
+								}
+								return false;
+							}
+
+							return true;
+						}
+
+						public Collection<Resource> getChangedResources() {
+							return changedResources;
+						}
+
+						public Collection<Resource> getRemovedResources() {
+							return removedResources;
+						}
+					}
+
+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+					delta.accept(visitor);
+
+					if (!visitor.getRemovedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 removedResources.addAll(visitor.getRemovedResources());
+									 if (!isDirty()) {
+										 getSite().getPage().closeEditor(ElementTypesConfigurationsEditor.this, false);
+									 }
+								 }
+							 });
+					}
+
+					if (!visitor.getChangedResources().isEmpty()) {
+						getSite().getShell().getDisplay().asyncExec
+							(new Runnable() {
+								 public void run() {
+									 changedResources.addAll(visitor.getChangedResources());
+									 if (getSite().getPage().getActiveEditor() == ElementTypesConfigurationsEditor.this) {
+										 handleActivate();
+									 }
+								 }
+							 });
+					}
+				}
+				catch (CoreException exception) {
+					TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * Handles activation of the editor or it's associated views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleActivate() {
+		// Recompute the read only state.
+		//
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
+		  editingDomain.getResourceToReadOnlyMap().clear();
+
+		  // Refresh any actions that may become enabled or disabled.
+		  //
+		  setSelection(getSelection());
+		}
+
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
+				getSite().getPage().closeEditor(ElementTypesConfigurationsEditor.this, false);
+			}
+			else {
+				removedResources.clear();
+				changedResources.clear();
+				savedResources.clear();
+			}
+		}
+		else if (!changedResources.isEmpty()) {
+			changedResources.removeAll(savedResources);
+			handleChangedResources();
+			changedResources.clear();
+			savedResources.clear();
+		}
+	}
+
+	/**
+	 * Handles what to do with changed resources on activation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
+				changedResources.addAll(editingDomain.getResourceSet().getResources());
+			}
+			editingDomain.getCommandStack().flush();
+
+			updateProblemIndication = false;
+			for (Resource resource : changedResources) {
+				if (resource.isLoaded()) {
+					resource.unload();
+					try {
+						resource.load(Collections.EMPTY_MAP);
+					}
+					catch (IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+						}
+					}
+				}
+			}
+
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
+				setSelection(StructuredSelection.EMPTY);
+			}
+
+			updateProblemIndication = true;
+			updateProblemIndication();
+		}
+	}
+
+	/**
+	 * Updates the problems indication with the information described in the specified diagnostic.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			BasicDiagnostic diagnostic =
+				new BasicDiagnostic
+					(Diagnostic.OK,
+					 "org.eclipse.papyrus.infra.types.editor",
+					 0,
+					 null,
+					 new Object [] { editingDomain.getResourceSet() });
+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
+					diagnostic.add(childDiagnostic);
+				}
+			}
+
+			int lastEditorPage = getPageCount() - 1;
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					setActivePage(lastEditorPage);
+				}
+			}
+			else if (diagnostic.getSeverity() != Diagnostic.OK) {
+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+				problemEditorPart.setDiagnostic(diagnostic);
+				problemEditorPart.setMarkerHelper(markerHelper);
+				try {
+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+					setPageText(lastEditorPage, problemEditorPart.getPartName());
+					setActivePage(lastEditorPage);
+					showTabs();
+				}
+				catch (PartInitException exception) {
+					TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+				markerHelper.deleteMarkers(editingDomain.getResourceSet());
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					try {
+						markerHelper.createMarkers(diagnostic);
+					}
+					catch (CoreException exception) {
+						TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Shows a dialog that asks if conflicting changes should be discarded.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean handleDirtyConflict() {
+		return
+			MessageDialog.openQuestion
+				(getSite().getShell(),
+				 getString("_UI_FileConflict_label"),
+				 getString("_WARN_FileConflict"));
+	}
+
+	/**
+	 * This creates a model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ElementTypesConfigurationsEditor() {
+		super();
+		initializeEditingDomain();
+	}
+
+	/**
+	 * This sets up the editing domain for the model editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void initializeEditingDomain() {
+		// Create an adapter factory that yields item providers.
+		//
+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ElementTypesConfigurationsItemProviderAdapterFactory());
+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+		// Create the command stack that will notify this editor as commands are executed.
+		//
+		BasicCommandStack commandStack = new BasicCommandStack();
+
+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+		//
+		commandStack.addCommandStackListener
+			(new CommandStackListener() {
+				 public void commandStackChanged(final EventObject event) {
+					 getContainer().getDisplay().asyncExec
+						 (new Runnable() {
+							  public void run() {
+								  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+								  // Try to select the affected objects.
+								  //
+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+								  if (mostRecentCommand != null) {
+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+								  }
+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {
+									  PropertySheetPage propertySheetPage = i.next();
+									  if (propertySheetPage.getControl().isDisposed()) {
+										  i.remove();
+									  }
+									  else {
+										  propertySheetPage.refresh();
+									  }
+								  }
+							  }
+						  });
+				 }
+			 });
+
+		// Create the editing domain with a special command stack.
+		//
+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+	}
+
+	/**
+	 * This is here for the listener to be able to call it.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+			@Override
+	protected void firePropertyChange(int action) {
+		super.firePropertyChange(action);
+	}
+
+	/**
+	 * This sets the selection into whichever viewer is active.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelectionToViewer(Collection<?> collection) {
+		final Collection<?> theSelection = collection;
+		// Make sure it's okay.
+		//
+		if (theSelection != null && !theSelection.isEmpty()) {
+			Runnable runnable =
+				new Runnable() {
+					public void run() {
+						// Try to select the items in the current content viewer of the editor.
+						//
+						if (currentViewer != null) {
+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+						}
+					}
+				};
+			getSite().getShell().getDisplay().asyncExec(runnable);
+		}
+	}
+
+	/**
+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomain getEditingDomain() {
+		return editingDomain;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getElements(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object [] getChildren(Object object) {
+			Object parent = super.getParent(object);
+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public boolean hasChildren(Object object) {
+			Object parent = super.getParent(object);
+			return parent != null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public Object getParent(Object object) {
+			return null;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
+				currentViewerPane.showFocus(false);
+			}
+			currentViewerPane = viewerPane;
+		}
+		setCurrentViewer(currentViewerPane.getViewer());
+	}
+
+	/**
+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+	 * is the current one.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCurrentViewer(Viewer viewer) {
+		// If it is changing...
+		//
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
+				// Create the listener on demand.
+				//
+				selectionChangedListener =
+					new ISelectionChangedListener() {
+						// This just notifies those things that are affected by the section.
+						//
+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+							setSelection(selectionChangedEvent.getSelection());
+						}
+					};
+			}
+
+			// Stop listening to the old one.
+			//
+			if (currentViewer != null) {
+				currentViewer.removeSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Start listening to the new one.
+			//
+			if (viewer != null) {
+				viewer.addSelectionChangedListener(selectionChangedListener);
+			}
+
+			// Remember it.
+			//
+			currentViewer = viewer;
+
+			// Set the editors selection based on the current viewer's selection.
+			//
+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+		}
+	}
+
+	/**
+	 * This returns the viewer as required by the {@link IViewerProvider} interface.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Viewer getViewer() {
+		return currentViewer;
+	}
+
+	/**
+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createContextMenuFor(StructuredViewer viewer) {
+		MenuManager contextMenu = new MenuManager("#PopUp");
+		contextMenu.add(new Separator("additions"));
+		contextMenu.setRemoveAllWhenShown(true);
+		contextMenu.addMenuListener(this);
+		Menu menu= contextMenu.createContextMenu(viewer.getControl());
+		viewer.getControl().setMenu(menu);
+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };
+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+	}
+
+	/**
+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createModel() {
+		URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
+		Exception exception = null;
+		Resource resource = null;
+		try {
+			// Load the resource through the editing domain.
+			//
+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+		}
+		catch (Exception e) {
+			exception = e;
+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+		}
+
+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+		}
+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+	}
+
+	/**
+	 * Returns a diagnostic describing the errors and warnings listed in the resource
+	 * and the specified exception (if any).
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		boolean hasErrors = !resource.getErrors().isEmpty();
+		if (hasErrors || !resource.getWarnings().isEmpty()) {
+			BasicDiagnostic basicDiagnostic =
+				new BasicDiagnostic
+					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
+					 "org.eclipse.papyrus.infra.types.editor",
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()),
+					 new Object [] { exception == null ? (Object)resource : exception });
+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+			return basicDiagnostic;
+		}
+		else if (exception != null) {
+			return
+				new BasicDiagnostic
+					(Diagnostic.ERROR,
+					 "org.eclipse.papyrus.infra.types.editor",
+					 0,
+					 getString("_UI_CreateModelError_message", resource.getURI()),
+					 new Object[] { exception });
+		}
+		else {
+			return Diagnostic.OK_INSTANCE;
+		}
+	}
+
+	/**
+	 * This is the method used by the framework to install your own controls.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void createPages() {
+		// Creates the model from the editor input
+		//
+		createModel();
+
+		// Only creates the other pages if there is something that can be edited
+		//
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+			// Create a page for the selection tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), ElementTypesConfigurationsEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				selectionViewer = (TreeViewer)viewerPane.getViewer();
+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+
+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+				selectionViewer.setInput(editingDomain.getResourceSet());
+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+				viewerPane.setTitle(editingDomain.getResourceSet());
+
+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(selectionViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+			}
+
+			// Create a page for the parent tree view.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), ElementTypesConfigurationsEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							Tree tree = new Tree(composite, SWT.MULTI);
+							TreeViewer newTreeViewer = new TreeViewer(tree);
+							return newTreeViewer;
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				parentViewer = (TreeViewer)viewerPane.getViewer();
+				parentViewer.setAutoExpandLevel(30);
+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(parentViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ParentPage_label"));
+			}
+
+			// This is the page for the list viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), ElementTypesConfigurationsEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new ListViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				listViewer = (ListViewer)viewerPane.getViewer();
+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(listViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_ListPage_label"));
+			}
+
+			// This is the page for the tree viewer
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), ElementTypesConfigurationsEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				treeViewer = (TreeViewer)viewerPane.getViewer();
+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+				createContextMenuFor(treeViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreePage_label"));
+			}
+
+			// This is the page for the table viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), ElementTypesConfigurationsEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TableViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+				tableViewer = (TableViewer)viewerPane.getViewer();
+
+				Table table = tableViewer.getTable();
+				TableLayout layout = new TableLayout();
+				table.setLayout(layout);
+				table.setHeaderVisible(true);
+				table.setLinesVisible(true);
+
+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(3, 100, true));
+				objectColumn.setText(getString("_UI_ObjectColumn_label"));
+				objectColumn.setResizable(true);
+
+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+				layout.addColumnData(new ColumnWeightData(2, 100, true));
+				selfColumn.setText(getString("_UI_SelfColumn_label"));
+				selfColumn.setResizable(true);
+
+				tableViewer.setColumnProperties(new String [] {"a", "b"});
+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(tableViewer);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TablePage_label"));
+			}
+
+			// This is the page for the table tree viewer.
+			//
+			{
+				ViewerPane viewerPane =
+					new ViewerPane(getSite().getPage(), ElementTypesConfigurationsEditor.this) {
+						@Override
+						public Viewer createViewer(Composite composite) {
+							return new TreeViewer(composite);
+						}
+						@Override
+						public void requestActivation() {
+							super.requestActivation();
+							setCurrentViewerPane(this);
+						}
+					};
+				viewerPane.createControl(getContainer());
+
+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+				Tree tree = treeViewerWithColumns.getTree();
+				tree.setLayoutData(new FillLayout());
+				tree.setHeaderVisible(true);
+				tree.setLinesVisible(true);
+
+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+				objectColumn.setText(getString("_UI_ObjectColumn_label"));
+				objectColumn.setResizable(true);
+				objectColumn.setWidth(250);
+
+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+				selfColumn.setText(getString("_UI_SelfColumn_label"));
+				selfColumn.setResizable(true);
+				selfColumn.setWidth(200);
+
+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+				createContextMenuFor(treeViewerWithColumns);
+				int pageIndex = addPage(viewerPane.getControl());
+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
+			}
+
+			getSite().getShell().getDisplay().asyncExec
+				(new Runnable() {
+					 public void run() {
+						 setActivePage(0);
+					 }
+				 });
+		}
+
+		// Ensures that this editor will only display the page's tab
+		// area if there are more than one page
+		//
+		getContainer().addControlListener
+			(new ControlAdapter() {
+				boolean guard = false;
+				@Override
+				public void controlResized(ControlEvent event) {
+					if (!guard) {
+						guard = true;
+						hideTabs();
+						guard = false;
+					}
+				}
+			 });
+
+		getSite().getShell().getDisplay().asyncExec
+			(new Runnable() {
+				 public void run() {
+					 updateProblemIndication();
+				 }
+			 });
+	}
+
+	/**
+	 * If there is just one page in the multi-page editor part,
+	 * this hides the single tab at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
+			setPageText(0, "");
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(1);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y + 6);
+			}
+		}
+	}
+
+	/**
+	 * If there is more than one page in the multi-page editor part,
+	 * this shows the tabs at the bottom.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void showTabs() {
+		if (getPageCount() > 1) {
+			setPageText(0, getString("_UI_SelectionPage_label"));
+			if (getContainer() instanceof CTabFolder) {
+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+				Point point = getContainer().getSize();
+				getContainer().setSize(point.x, point.y - 6);
+			}
+		}
+	}
+
+	/**
+	 * This is used to track the active viewer.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void pageChange(int pageIndex) {
+		super.pageChange(pageIndex);
+
+		if (contentOutlinePage != null) {
+			handleContentOutlineSelection(contentOutlinePage.getSelection());
+		}
+	}
+
+	/**
+	 * This is how the framework determines which interfaces we implement.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("rawtypes")
+	@Override
+	public Object getAdapter(Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
+			return showOutlineView() ? getContentOutlinePage() : null;
+		}
+		else if (key.equals(IPropertySheetPage.class)) {
+			return getPropertySheetPage();
+		}
+		else if (key.equals(IGotoMarker.class)) {
+			return this;
+		}
+		else {
+			return super.getAdapter(key);
+		}
+	}
+
+	/**
+	 * This accesses a cached version of the content outliner.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
+			// The content outline is just a tree.
+			//
+			class MyContentOutlinePage extends ContentOutlinePage {
+				@Override
+				public void createControl(Composite parent) {
+					super.createControl(parent);
+					contentOutlineViewer = getTreeViewer();
+					contentOutlineViewer.addSelectionChangedListener(this);
+
+					// Set up the tree viewer.
+					//
+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+					contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+					// Make sure our popups work.
+					//
+					createContextMenuFor(contentOutlineViewer);
+
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+					  // Select the root object in the view.
+					  //
+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+					}
+				}
+
+				@Override
+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
+					super.makeContributions(menuManager, toolBarManager, statusLineManager);
+					contentOutlineStatusLineManager = statusLineManager;
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			}
+
+			contentOutlinePage = new MyContentOutlinePage();
+
+			// Listen to selection so that we can handle it is a special way.
+			//
+			contentOutlinePage.addSelectionChangedListener
+				(new ISelectionChangedListener() {
+					 // This ensures that we handle selections correctly.
+					 //
+					 public void selectionChanged(SelectionChangedEvent event) {
+						 handleContentOutlineSelection(event.getSelection());
+					 }
+				 });
+		}
+
+		return contentOutlinePage;
+	}
+
+	/**
+	 * This accesses a cached version of the property sheet.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IPropertySheetPage getPropertySheetPage() {
+		PropertySheetPage propertySheetPage =
+			new ExtendedPropertySheetPage(editingDomain) {
+				@Override
+				public void setSelectionToViewer(List<?> selection) {
+					ElementTypesConfigurationsEditor.this.setSelectionToViewer(selection);
+					ElementTypesConfigurationsEditor.this.setFocus();
+				}
+
+				@Override
+				public void setActionBars(IActionBars actionBars) {
+					super.setActionBars(actionBars);
+					getActionBarContributor().shareGlobalActions(this, actionBars);
+				}
+			};
+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+		propertySheetPages.add(propertySheetPage);
+
+		return propertySheetPage;
+	}
+
+	/**
+	 * This deals with how we want selection in the outliner to affect the other views.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+			if (selectedElements.hasNext()) {
+				// Get the first selected element.
+				//
+				Object selectedElement = selectedElements.next();
+
+				// If it's the selection viewer, then we want it to select the same selection as this selection.
+				//
+				if (currentViewerPane.getViewer() == selectionViewer) {
+					ArrayList<Object> selectionList = new ArrayList<Object>();
+					selectionList.add(selectedElement);
+					while (selectedElements.hasNext()) {
+						selectionList.add(selectedElements.next());
+					}
+
+					// Set the selection to the widget.
+					//
+					selectionViewer.setSelection(new StructuredSelection(selectionList));
+				}
+				else {
+					// Set the input to the widget.
+					//
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
+						currentViewerPane.getViewer().setInput(selectedElement);
+						currentViewerPane.setTitle(selectedElement);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isDirty() {
+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+	}
+
+	/**
+	 * This is for implementing {@link IEditorPart} and simply saves the model file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSave(IProgressMonitor progressMonitor) {
+		// Save only resources that have actually changed.
+		//
+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);
+
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		//
+		WorkspaceModifyOperation operation =
+			new WorkspaceModifyOperation() {
+				// This is the method that gets invoked when the operation runs.
+				//
+				@Override
+				public void execute(IProgressMonitor monitor) {
+					// Save the resources to the file system.
+					//
+					boolean first = true;
+					for (Resource resource : editingDomain.getResourceSet().getResources()) {
+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+							try {
+								long timeStamp = resource.getTimeStamp();
+								resource.save(saveOptions);
+								if (resource.getTimeStamp() != timeStamp) {
+									savedResources.add(resource);
+								}
+							}
+							catch (Exception exception) {
+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+							}
+							first = false;
+						}
+					}
+				}
+			};
+
+		updateProblemIndication = false;
+		try {
+			// This runs the options, and shows progress.
+			//
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+			// Refresh the necessary state.
+			//
+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+			firePropertyChange(IEditorPart.PROP_DIRTY);
+		}
+		catch (Exception exception) {
+			// Something went wrong that shouldn't.
+			//
+			TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+		}
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+	/**
+	 * This returns whether something has been persisted to the URI of the specified resource.
+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean isPersisted(Resource resource) {
+		boolean result = false;
+		try {
+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+			if (stream != null) {
+				result = true;
+				stream.close();
+			}
+		}
+		catch (IOException e) {
+			// Ignore
+		}
+		return result;
+	}
+
+	/**
+	 * This always returns true because it is not currently supported.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		return true;
+	}
+
+	/**
+	 * This also changes the editor's input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void doSaveAs() {
+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+		saveAsDialog.open();
+		IPath path = saveAsDialog.getResult();
+		if (path != null) {
+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if (file != null) {
+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+			}
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		IProgressMonitor progressMonitor =
+			getActionBars().getStatusLineManager() != null ?
+				getActionBars().getStatusLineManager().getProgressMonitor() :
+				new NullProgressMonitor();
+		doSave(progressMonitor);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void gotoMarker(IMarker marker) {
+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
+		if (!targetObjects.isEmpty()) {
+			setSelectionToViewer(targetObjects);
+		}
+	}
+
+	/**
+	 * This is called during startup.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput editorInput) {
+		setSite(site);
+		setInputWithNotify(editorInput);
+		setPartName(editorInput.getName());
+		site.setSelectionProvider(this);
+		site.getPage().addPartListener(partListener);
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setFocus() {
+		if (currentViewerPane != null) {
+			currentViewerPane.setFocus();
+		}
+		else {
+			getControl(getActivePage()).setFocus();
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.add(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+		selectionChangedListeners.remove(listener);
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ISelection getSelection() {
+		return editorSelection;
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+	 * Calling this result will notify the listeners.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSelection(ISelection selection) {
+		editorSelection = selection;
+
+		for (ISelectionChangedListener listener : selectionChangedListeners) {
+			listener.selectionChanged(new SelectionChangedEvent(this, selection));
+		}
+		setStatusLineManager(selection);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStatusLineManager(ISelection selection) {
+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
+				Collection<?> collection = ((IStructuredSelection)selection).toList();
+				switch (collection.size()) {
+					case 0: {
+						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+						break;
+					}
+					case 1: {
+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+						break;
+					}
+					default: {
+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+						break;
+					}
+				}
+			}
+			else {
+				statusLineManager.setMessage("");
+			}
+		}
+	}
+
+	/**
+	 * This looks up a string in the plugin's plugin.properties file.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key) {
+		return TypesConfigurationsEditorPlugin.INSTANCE.getString(key);
+	}
+
+	/**
+	 * This looks up a string in plugin.properties, making a substitution.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static String getString(String key, Object s1) {
+		return TypesConfigurationsEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void menuAboutToShow(IMenuManager menuManager) {
+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EditingDomainActionBarContributor getActionBarContributor() {
+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IActionBars getActionBars() {
+		return getActionBarContributor().getActionBars();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AdapterFactory getAdapterFactory() {
+		return adapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void dispose() {
+		updateProblemIndication = false;
+
+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+
+		getSite().getPage().removePartListener(partListener);
+
+		adapterFactory.dispose();
+
+		if (getActionBarContributor().getActiveEditor() == this) {
+			getActionBarContributor().setActiveEditor(null);
+		}
+
+		for (PropertySheetPage propertySheetPage : propertySheetPages) {
+			propertySheetPage.dispose();
+		}
+
+		if (contentOutlinePage != null) {
+			contentOutlinePage.dispose();
+		}
+
+		super.dispose();
+	}
+
+	/**
+	 * Returns whether the outline view should be presented to the user.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected boolean showOutlineView() {
+		return true;
+	}
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementtypesconfigurationsModelWizard.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/ElementTypesConfigurationsModelWizard.java
index 3d1d3fc3065..c519d7836c1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementtypesconfigurationsModelWizard.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/ElementTypesConfigurationsModelWizard.java
@@ -1,640 +1,640 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.presentation;

-

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.MissingResourceException;

-import java.util.StringTokenizer;

-

-import org.eclipse.emf.common.CommonPlugin;

-

-import org.eclipse.emf.common.util.URI;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EClassifier;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.ecore.xmi.XMLResource;

-

-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ResourcesPlugin;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-

-import org.eclipse.jface.dialogs.MessageDialog;

-

-import org.eclipse.jface.viewers.IStructuredSelection;

-

-import org.eclipse.jface.wizard.Wizard;

-import org.eclipse.jface.wizard.WizardPage;

-

-import org.eclipse.swt.SWT;

-

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.ModifyEvent;

-

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-

-import org.eclipse.ui.INewWizard;

-import org.eclipse.ui.IWorkbench;

-

-import org.eclipse.ui.actions.WorkspaceModifyOperation;

-

-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

-

-import org.eclipse.ui.part.FileEditorInput;

-import org.eclipse.ui.part.ISetSelectionTarget;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;

-

-

-import org.eclipse.core.runtime.Path;

-

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.StructuredSelection;

-

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.IWorkbenchWindow;

-import org.eclipse.ui.PartInitException;

-

-

-/**

- * This is a simple wizard for creating a new model file.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class ElementtypesconfigurationsModelWizard extends Wizard implements INewWizard {

-	/**

-	 * The supported extensions for created files.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final List<String> FILE_EXTENSIONS =

-		Collections.unmodifiableList(Arrays.asList(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsEditorFilenameExtensions").split("\\s*,\\s*")));

-

-	/**

-	 * A formatted list of supported file extensions, suitable for display.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final String FORMATTED_FILE_EXTENSIONS =

-		ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

-

-	/**

-	 * This caches an instance of the model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ElementtypesconfigurationsPackage elementtypesconfigurationsPackage = ElementtypesconfigurationsPackage.eINSTANCE;

-

-	/**

-	 * This caches an instance of the model factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ElementtypesconfigurationsFactory elementtypesconfigurationsFactory = elementtypesconfigurationsPackage.getElementtypesconfigurationsFactory();

-

-	/**

-	 * This is the file creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ElementtypesconfigurationsModelWizardNewFileCreationPage newFileCreationPage;

-

-	/**

-	 * This is the initial object creation page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ElementtypesconfigurationsModelWizardInitialObjectCreationPage initialObjectCreationPage;

-

-	/**

-	 * Remember the selection during initialization for populating the default container.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IStructuredSelection selection;

-

-	/**

-	 * Remember the workbench during initialization.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IWorkbench workbench;

-

-	/**

-	 * Caches the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected List<String> initialObjectNames;

-

-	/**

-	 * This just records the information.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void init(IWorkbench workbench, IStructuredSelection selection) {

-		this.workbench = workbench;

-		this.selection = selection;

-		setWindowTitle(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ElementTypesConfigurationsEditorPlugin.INSTANCE.getImage("full/wizban/NewElementtypesconfigurations")));

-	}

-

-	/**

-	 * Returns the names of the types that can be created as the root object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<String> getInitialObjectNames() {

-		if (initialObjectNames == null) {

-			initialObjectNames = new ArrayList<String>();

-			for (EClassifier eClassifier : elementtypesconfigurationsPackage.getEClassifiers()) {

-				if (eClassifier instanceof EClass) {

-					EClass eClass = (EClass)eClassifier;

-					if (!eClass.isAbstract()) {

-						initialObjectNames.add(eClass.getName());

-					}

-				}

-			}

-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

-		}

-		return initialObjectNames;

-	}

-

-	/**

-	 * Create a new model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected EObject createInitialModel() {

-		EClass eClass = (EClass)elementtypesconfigurationsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

-		EObject rootObject = elementtypesconfigurationsFactory.create(eClass);

-		return rootObject;

-	}

-

-	/**

-	 * Do the work after everything is specified.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean performFinish() {

-		try {

-			// Remember the file.

-			//

-			final IFile modelFile = getModelFile();

-

-			// Do the work within an operation.

-			//

-			WorkspaceModifyOperation operation =

-				new WorkspaceModifyOperation() {

-					@Override

-					protected void execute(IProgressMonitor progressMonitor) {

-						try {

-							// Create a resource set

-							//

-							ResourceSet resourceSet = new ResourceSetImpl();

-

-							// Get the URI of the model file.

-							//

-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

-

-							// Create a resource for this file.

-							//

-							Resource resource = resourceSet.createResource(fileURI, ElementtypesconfigurationsPackage.eCONTENT_TYPE);

-

-							// Add the initial model object to the contents.

-							//

-							EObject rootObject = createInitialModel();

-							if (rootObject != null) {

-								resource.getContents().add(rootObject);

-							}

-

-							// Save the contents of the resource to the file system.

-							//

-							Map<Object, Object> options = new HashMap<Object, Object>();

-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

-							resource.save(options);

-						}

-						catch (Exception exception) {

-							ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-						}

-						finally {

-							progressMonitor.done();

-						}

-					}

-				};

-

-			getContainer().run(false, false, operation);

-

-			// Select the new file resource in the current view.

-			//

-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

-			IWorkbenchPage page = workbenchWindow.getActivePage();

-			final IWorkbenchPart activePart = page.getActivePart();

-			if (activePart instanceof ISetSelectionTarget) {

-				final ISelection targetSelection = new StructuredSelection(modelFile);

-				getShell().getDisplay().asyncExec

-					(new Runnable() {

-						 public void run() {

-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

-						 }

-					 });

-			}

-

-			// Open an editor on the new file.

-			//

-			try {

-				page.openEditor

-					(new FileEditorInput(modelFile),

-					 workbench.getEditorRegistry().getDefaultEditor

-					 	(modelFile.getFullPath().toString(),

-					 	 Platform.getContentTypeManager().getContentType(ElementtypesconfigurationsPackage.eCONTENT_TYPE)).getId());					 	 

-			}

-			catch (PartInitException exception) {

-				MessageDialog.openError(workbenchWindow.getShell(), ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

-				return false;

-			}

-

-			return true;

-		}

-		catch (Exception exception) {

-			ElementTypesConfigurationsEditorPlugin.INSTANCE.log(exception);

-			return false;

-		}

-	}

-

-	/**

-	 * This is the one page of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ElementtypesconfigurationsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ElementtypesconfigurationsModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

-			super(pageId, selection);

-		}

-

-		/**

-		 * The framework calls this to see if the file is correct.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		protected boolean validatePage() {

-			if (super.validatePage()) {

-				String extension = new Path(getFileName()).getFileExtension();

-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

-					setErrorMessage(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

-					return false;

-				}

-				return true;

-			}

-			return false;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public IFile getModelFile() {

-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

-		}

-	}

-

-	/**

-	 * This is the page where the type of object to create is selected.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public class ElementtypesconfigurationsModelWizardInitialObjectCreationPage extends WizardPage {

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo initialObjectField;

-

-		/**

-		 * @generated

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 */

-		protected List<String> encodings;

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Combo encodingField;

-

-		/**

-		 * Pass in the selection.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ElementtypesconfigurationsModelWizardInitialObjectCreationPage(String pageId) {

-			super(pageId);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public void createControl(Composite parent) {

-			Composite composite = new Composite(parent, SWT.NONE); {

-				GridLayout layout = new GridLayout();

-				layout.numColumns = 1;

-				layout.verticalSpacing = 12;

-				composite.setLayout(layout);

-

-				GridData data = new GridData();

-				data.verticalAlignment = GridData.FILL;

-				data.grabExcessVerticalSpace = true;

-				data.horizontalAlignment = GridData.FILL;

-				composite.setLayoutData(data);

-			}

-

-			Label containerLabel = new Label(composite, SWT.LEFT);

-			{

-				containerLabel.setText(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				containerLabel.setLayoutData(data);

-			}

-

-			initialObjectField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				initialObjectField.setLayoutData(data);

-			}

-

-			for (String objectName : getInitialObjectNames()) {

-				initialObjectField.add(getLabel(objectName));

-			}

-

-			if (initialObjectField.getItemCount() == 1) {

-				initialObjectField.select(0);

-			}

-			initialObjectField.addModifyListener(validator);

-

-			Label encodingLabel = new Label(composite, SWT.LEFT);

-			{

-				encodingLabel.setText(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

-

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				encodingLabel.setLayoutData(data);

-			}

-			encodingField = new Combo(composite, SWT.BORDER);

-			{

-				GridData data = new GridData();

-				data.horizontalAlignment = GridData.FILL;

-				data.grabExcessHorizontalSpace = true;

-				encodingField.setLayoutData(data);

-			}

-

-			for (String encoding : getEncodings()) {

-				encodingField.add(encoding);

-			}

-

-			encodingField.select(0);

-			encodingField.addModifyListener(validator);

-

-			setPageComplete(validatePage());

-			setControl(composite);

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected ModifyListener validator =

-			new ModifyListener() {

-				public void modifyText(ModifyEvent e) {

-					setPageComplete(validatePage());

-				}

-			};

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected boolean validatePage() {

-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		@Override

-		public void setVisible(boolean visible) {

-			super.setVisible(visible);

-			if (visible) {

-				if (initialObjectField.getItemCount() == 1) {

-					initialObjectField.clearSelection();

-					encodingField.setFocus();

-				}

-				else {

-					encodingField.clearSelection();

-					initialObjectField.setFocus();

-				}

-			}

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getInitialObjectName() {

-			String label = initialObjectField.getText();

-

-			for (String name : getInitialObjectNames()) {

-				if (getLabel(name).equals(label)) {

-					return name;

-				}

-			}

-			return null;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public String getEncoding() {

-			return encodingField.getText();

-		}

-

-		/**

-		 * Returns the label for the specified type name.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected String getLabel(String typeName) {

-			try {

-				return ElementTypesConfigurationsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

-			}

-			catch(MissingResourceException mre) {

-				ElementTypesConfigurationsEditorPlugin.INSTANCE.log(mre);

-			}

-			return typeName;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected Collection<String> getEncodings() {

-			if (encodings == null) {

-				encodings = new ArrayList<String>();

-				for (StringTokenizer stringTokenizer = new StringTokenizer(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

-					encodings.add(stringTokenizer.nextToken());

-				}

-			}

-			return encodings;

-		}

-	}

-

-	/**

-	 * The framework calls this to create the contents of the wizard.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-		@Override

-	public void addPages() {

-		// Create a page, set the title, and the initial model file name.

-		//

-		newFileCreationPage = new ElementtypesconfigurationsModelWizardNewFileCreationPage("Whatever", selection);

-		newFileCreationPage.setTitle(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsModelWizard_label"));

-		newFileCreationPage.setDescription(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsModelWizard_description"));

-		newFileCreationPage.setFileName(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

-		addPage(newFileCreationPage);

-

-		// Try and get the resource selection to determine a current directory for the file dialog.

-		//

-		if (selection != null && !selection.isEmpty()) {

-			// Get the resource...

-			//

-			Object selectedElement = selection.iterator().next();

-			if (selectedElement instanceof IResource) {

-				// Get the resource parent, if its a file.

-				//

-				IResource selectedResource = (IResource)selectedElement;

-				if (selectedResource.getType() == IResource.FILE) {

-					selectedResource = selectedResource.getParent();

-				}

-

-				// This gives us a directory...

-				//

-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

-					// Set this for the container.

-					//

-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

-

-					// Make up a unique new name here.

-					//

-					String defaultModelBaseFilename = ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsEditorFilenameDefaultBase");

-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

-					}

-					newFileCreationPage.setFileName(modelFilename);

-				}

-			}

-		}

-		initialObjectCreationPage = new ElementtypesconfigurationsModelWizardInitialObjectCreationPage("Whatever2");

-		initialObjectCreationPage.setTitle(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementtypesconfigurationsModelWizard_label"));

-		initialObjectCreationPage.setDescription(ElementTypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

-		addPage(initialObjectCreationPage);

-	}

-

-	/**

-	 * Get the file from the page.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IFile getModelFile() {

-		return newFileCreationPage.getModelFile();

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.common.CommonPlugin;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ElementTypesConfigurationsModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+		Collections.unmodifiableList(Arrays.asList(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsEditorFilenameExtensions").split("\\s*,\\s*")));
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+		TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ElementTypesConfigurationsPackage elementTypesConfigurationsPackage = ElementTypesConfigurationsPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ElementTypesConfigurationsFactory elementTypesConfigurationsFactory = elementTypesConfigurationsPackage.getElementTypesConfigurationsFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ElementTypesConfigurationsModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ElementTypesConfigurationsModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(TypesConfigurationsEditorPlugin.INSTANCE.getImage("full/wizban/NewElementTypesConfigurations")));
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : elementTypesConfigurationsPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)elementTypesConfigurationsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = elementTypesConfigurationsFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI, ElementTypesConfigurationsPackage.eCONTENT_TYPE);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor
+					 	(modelFile.getFullPath().toString(),
+					 	 Platform.getContentTypeManager().getContentType(ElementTypesConfigurationsPackage.eCONTENT_TYPE)).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			TypesConfigurationsEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ElementTypesConfigurationsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ElementTypesConfigurationsModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+					setErrorMessage(TypesConfigurationsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class ElementTypesConfigurationsModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ElementTypesConfigurationsModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE); {
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+			new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return TypesConfigurationsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+			}
+			catch(MissingResourceException mre) {
+				TypesConfigurationsEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+		@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new ElementTypesConfigurationsModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsModelWizard_label"));
+		newFileCreationPage.setDescription(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsModelWizard_description"));
+		newFileCreationPage.setFileName(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsEditorFilenameDefaultBase");
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new ElementTypesConfigurationsModelWizardInitialObjectCreationPage("Whatever2");
+		initialObjectCreationPage.setTitle(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_ElementTypesConfigurationsModelWizard_label"));
+		initialObjectCreationPage.setDescription(TypesConfigurationsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementTypesConfigurationsEditorPlugin.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/TypesConfigurationsEditorPlugin.java
index 01c39f3c306..32080e31c8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/presentation/ElementTypesConfigurationsEditorPlugin.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.editor/src-gen/org/eclipse/papyrus/infra/types/presentation/TypesConfigurationsEditorPlugin.java
@@ -1,101 +1,101 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.presentation;

-

-import org.eclipse.emf.common.EMFPlugin;

-

-import org.eclipse.emf.common.ui.EclipseUIPlugin;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-/**

- * This is the central singleton for the ElementTypesConfigurations editor plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public final class ElementTypesConfigurationsEditorPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static final ElementTypesConfigurationsEditorPlugin INSTANCE = new ElementTypesConfigurationsEditorPlugin();

-	

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ElementTypesConfigurationsEditorPlugin() {

-		super

-			(new ResourceLocator [] {

-			});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-	

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-	

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class Implementation extends EclipseUIPlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-	

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.presentation;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the ElementTypesConfigurations editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class TypesConfigurationsEditorPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final TypesConfigurationsEditorPlugin INSTANCE = new TypesConfigurationsEditorPlugin();
+	
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TypesConfigurationsEditorPlugin() {
+		super
+			(new ResourceLocator [] {
+			});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+	
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+	
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipseUIPlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+	
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.classpath
index 6cc5414644b..6cc5414644b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.classpath
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.classpath
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project
new file mode 100644
index 00000000000..98406c46699
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.types.rulebased</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs
index 9ca8e68231b..9ca8e68231b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..792e20ed053
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

+ org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;bundle-version="2.6.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.types;visibility:=reexport,

+ org.eclipse.emf.edit;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.types.edit;bundle-version="1.2.0";visibility:=reexport

+Export-Package: org.eclipse.papyrus.infra.types.rulebased,

+ org.eclipse.papyrus.infra.types.rulebased.core,

+ org.eclipse.papyrus.infra.types.rulebased.impl,

+ org.eclipse.papyrus.infra.types.rulebased.provider,

+ org.eclipse.papyrus.infra.types.rulebased.util

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin$Implementation

+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.rulebased;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
index 32af9fa1c65..32af9fa1c65 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif
index 1295f5216ee..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_AndInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerConfiguration.gif
index 96a3cb79d20..96a3cb79d20 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
index 889f3af917f..889f3af917f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif
index 6f6c92e3feb..6f6c92e3feb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif
index 4fa1d3e6761..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_OrInvariantRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_AndRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_AndRuleConfiguration.gif
new file mode 100644
index 00000000000..628a5cdd1dc
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_AndRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_NotRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_NotRuleConfiguration.gif
new file mode 100644
index 00000000000..d7c5af79864
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_NotRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_OrRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_OrRuleConfiguration.gif
new file mode 100644
index 00000000000..a17c76f8558
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_OrRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantContainerTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantContainerTypeConfiguration.gif
index 052b213d0c0..052b213d0c0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantContainerTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantContainerTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantSemanticTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantSemanticTypeConfiguration.gif
index 5777ba5f48d..5777ba5f48d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantSemanticTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif
index 1e6c63ceb46..1e6c63ceb46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_InvariantTypeConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_RuleBasedTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_RuleBasedTypeConfiguration.gif
new file mode 100644
index 00000000000..c1fbe127e0f
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_RuleBasedTypeConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_RuledTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_RuledTypeConfiguration.gif
new file mode 100644
index 00000000000..92e5c4972a6
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateElementTypeSetConfiguration_elementTypeConfigurations_RuledTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
index 86ec735a156..86ec735a156 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantContainerConfiguration_permissions_HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif
index 7ca3215e5f4..7ca3215e5f4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantContainerRuleConfiguration_permissions_HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
index 99df60b4709..99df60b4709 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerConfiguration.gif
index 8c3d85f7383..8c3d85f7383 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
index e06d6105a5c..e06d6105a5c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
index 7402e2232e3..7402e2232e3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
index 1295f5216ee..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_AndInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
index ca9cabaa91c..ca9cabaa91c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif
index 6f6c92e3feb..6f6c92e3feb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
index 4fa1d3e6761..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_OrInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif
index 1295f5216ee..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_AndInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif
index 6f6c92e3feb..6f6c92e3feb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif
index 4fa1d3e6761..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_OrInvariantRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_AndRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_AndRuleConfiguration.gif
new file mode 100644
index 00000000000..ab6e9c96a9d
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_AndRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_NotRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_NotRuleConfiguration.gif
new file mode 100644
index 00000000000..9ff095f15de
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_NotRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_OrRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_OrRuleConfiguration.gif
new file mode 100644
index 00000000000..173020a7e95
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_OrRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_AndRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_AndRuleConfiguration.gif
new file mode 100644
index 00000000000..2255e986043
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_AndRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_NotRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_NotRuleConfiguration.gif
new file mode 100644
index 00000000000..59c4adae079
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_NotRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_OrRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_OrRuleConfiguration.gif
new file mode 100644
index 00000000000..66eed056387
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_invariantRuleConfiguration_OrRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_AndRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_AndRuleConfiguration.gif
new file mode 100644
index 00000000000..2255e986043
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_AndRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_NotRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_NotRuleConfiguration.gif
new file mode 100644
index 00000000000..59c4adae079
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_NotRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_OrRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_OrRuleConfiguration.gif
new file mode 100644
index 00000000000..66eed056387
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_OrRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/AndInvariantRuleConfiguration.gif
index 1295f5216ee..1295f5216ee 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/AndInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/AndInvariantRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/AndRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/AndRuleConfiguration.gif
new file mode 100644
index 00000000000..d92f34c8aea
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/AndRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/HierarchyPermission.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/HierarchyPermission.gif
index c4a8af41844..c4a8af41844 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/HierarchyPermission.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/HierarchyPermission.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantContainerConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantContainerConfiguration.gif
index 134551bff7e..134551bff7e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantContainerConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantContainerConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantContainerRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantContainerRuleConfiguration.gif
index 89ad5da38ab..89ad5da38ab 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantContainerRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantContainerRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantContainerTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantContainerTypeConfiguration.gif
index cdd3b76e3c0..cdd3b76e3c0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantContainerTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantContainerTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantSemanticTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
index ef56c140853..ef56c140853 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantSemanticTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantTypeConfiguration.gif
index 1e6c63ceb46..1e6c63ceb46 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/InvariantTypeConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/InvariantTypeConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/NotInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/NotInvariantRuleConfiguration.gif
index 6f6c92e3feb..6f6c92e3feb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/NotInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/NotInvariantRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/NotRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/NotRuleConfiguration.gif
new file mode 100644
index 00000000000..a17dc7d88e9
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/NotRuleConfiguration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/OrInvariantRuleConfiguration.gif
index 4fa1d3e6761..4fa1d3e6761 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/icons/full/obj16/OrInvariantRuleConfiguration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/OrInvariantRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/OrRuleConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/OrRuleConfiguration.gif
new file mode 100644
index 00000000000..8a5c70cbd74
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/OrRuleConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/RuleBasedTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/RuleBasedTypeConfiguration.gif
new file mode 100644
index 00000000000..498364f1c1a
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/RuleBasedTypeConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/RuledTypeConfiguration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/RuledTypeConfiguration.gif
new file mode 100644
index 00000000000..b3643da048a
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/icons/full/obj16/RuledTypeConfiguration.gif
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore
new file mode 100644
index 00000000000..cb4336e9939
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="rulebased" nsURI="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

+    nsPrefix="rulebased">

+  <eClassifiers xsi:type="ecore:EClass" name="RuleBasedTypeConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ruleConfiguration" lowerBound="1"

+        eType="#//RuleConfiguration" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="RuleConfiguration" abstract="true"/>

+  <eClassifiers xsi:type="ecore:EClass" name="CompositeRuleConfiguration" abstract="true"

+      eSuperTypes="#//RuleConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRules" lowerBound="2"

+        upperBound="-1" eType="#//RuleConfiguration" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NotRuleConfiguration" eSuperTypes="#//RuleConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="composedRule" lowerBound="1"

+        eType="#//RuleConfiguration"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AndRuleConfiguration" eSuperTypes="#//CompositeRuleConfiguration"/>

+  <eClassifiers xsi:type="ecore:EClass" name="OrRuleConfiguration" eSuperTypes="#//CompositeRuleConfiguration"/>

+</ecore:EPackage>

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel
new file mode 100644
index 00000000000..0a2f0324d3e
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.infra.types.rulebased/src-gen" creationSubmenus="true"

+    editDirectory="/org.eclipse.papyrus.infra.types.rulebased/src-gen" editorDirectory="/org.eclipse.papyrus.infra.types.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.infra.types.rulebased" modelName="RuleBased"

+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.types.tests/src-gen"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

+    editPluginID="org.eclipse.papyrus.infra.types.rulebased" editorPluginID="org.eclipse.papyrus.infra.types.editor"

+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>RuleBased.ecore</foreignModel>

+  <genPackages prefix="RuleBased" basePackage="org.eclipse.papyrus.infra.types" resource="XMI"

+      disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true"

+      ecorePackage="RuleBased.ecore#/">

+    <genClasses ecoreClass="RuleBased.ecore#//RuleBasedTypeConfiguration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuleBased.ecore#//RuleBasedTypeConfiguration/ruleConfiguration"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="RuleBased.ecore#//RuleConfiguration"/>

+    <genClasses image="false" ecoreClass="RuleBased.ecore#//CompositeRuleConfiguration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference RuleBased.ecore#//CompositeRuleConfiguration/composedRules"/>

+    </genClasses>

+    <genClasses ecoreClass="RuleBased.ecore#//NotRuleConfiguration">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference RuleBased.ecore#//NotRuleConfiguration/composedRule"/>

+    </genClasses>

+    <genClasses ecoreClass="RuleBased.ecore#//AndRuleConfiguration"/>

+    <genClasses ecoreClass="RuleBased.ecore#//OrRuleConfiguration"/>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
new file mode 100644
index 00000000000..065b805a8f5
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.types.rules/rulebased" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="RuleBased" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice" identifier="org.eclipse.papyrus.infra.types.rulebased.core.DefaultRuleEditHelperAdvice" inheritance="all" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
index 7d5c1f7a9d6..70e4bd38fa9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.properties
@@ -16,22 +16,16 @@ _UI_CreateChild_text3 = {1}
 _UI_CreateChild_tooltip = Create New {0} Under {1} Feature
 _UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
 _UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
 _UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_InvariantTypeConfiguration_type = Invariant Type Configuration
-_UI_InvariantRuleConfiguration_type = Invariant Rule Configuration
-_UI_CompositeInvariantRuleConfiguration_type = Composite Invariant Rule Configuration
-_UI_NotInvariantRuleConfiguration_type = Not Invariant Rule Configuration
-_UI_AndInvariantRuleConfiguration_type = And Invariant Rule Configuration
-_UI_OrInvariantRuleConfiguration_type = Or Invariant Rule Configuration
+_UI_RuleBasedTypeConfiguration_type = Type Configuration
+_UI_RuleConfiguration_type = Rule Configuration
+_UI_CompositeRuleConfiguration_type = Composite Rule Configuration
+_UI_NotRuleConfiguration_type = Not Rule Configuration
+_UI_AndRuleConfiguration_type = And Rule Configuration
+_UI_OrRuleConfiguration_type = Or Rule Configuration
 _UI_Unknown_type = Object
-
 _UI_Unknown_datatype= Value
-
-_UI_InvariantTypeConfiguration_invariantRuleConfiguration_feature = Invariant Rule Configuration
-_UI_CompositeInvariantRuleConfiguration_composedRules_feature = Composed Rules
-_UI_NotInvariantRuleConfiguration_composedRule_feature = Composed Rule
+_UI_RuleBasedTypeConfiguration_ruleConfiguration_feature = Rule Configuration
+_UI_CompositeRuleConfiguration_composedRules_feature = Composed Rules
+_UI_NotRuleConfiguration_composedRule_feature = Composed Rule
 _UI_Unknown_feature = Unspecified
-
-
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
new file mode 100644
index 00000000000..10d1e60363a
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/plugin.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension-point id="ruleKind" name="Rule Extension Point" schema="schema/ruleKind.exsd"/>

+

+

+

+

+

+   <extension

+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

+      <elementTypeSet

+            clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

+            path="model/rulebased.elementtypesconfigurations">

+      </elementTypeSet>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.types.core.elementTypeConfigurationKind">

+      <elementTypeConfigurationKind

+            configurationClass="org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration"

+            factoryClass="org.eclipse.papyrus.infra.types.rulebased.core.RuleElementTypeFactory">

+      </elementTypeConfigurationKind>

+   </extension>

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated RuleBased -->

+      <package

+            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

+            class="org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage"

+            genModel="model/RuleBased.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated RuleBased -->

+      <parser

+            type="rulebased"

+            class="org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated RuleBased -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

+            class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.childCreationExtenders">

+      <!-- @generated RuleBased -->

+      <extender

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

+            class="org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>

+   </extension>

+</plugin>

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml
new file mode 100644
index 00000000000..6d00b665fc3
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-types</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.types.rulebased</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/schema/invariantRule.exsd b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/schema/ruleKind.exsd
index 86b70d34e41..0e2163659ac 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/schema/invariantRule.exsd
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/schema/ruleKind.exsd
@@ -1,112 +1,112 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes" xmlns="http://www.w3.org/2001/XMLSchema">

-<annotation>

-      <appinfo>

-         <meta.schema plugin="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes" id="invariantRule" name="Invariant Rule Extension Point"/>

-      </appinfo>

-      <documentation>

-         Extension point to describe new invariant rules.

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <annotation>

-         <appinfo>

-            <meta.element />

-         </appinfo>

-      </annotation>

-      <complexType>

-         <sequence>

-            <element ref="invariantRule"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute translatable="true"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="invariantRule">

-      <complexType>

-         <attribute name="configurationClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-         <attribute name="invariantRuleClass" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appinfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule:"/>

-               </appinfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="since"/>

-      </appinfo>

-      <documentation>

-         [Enter the first release in which this extension point appears.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="examples"/>

-      </appinfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="apiinfo"/>

-      </appinfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appinfo>

-         <meta.section type="implementation"/>

-      </appinfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-

-</schema>

+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.infra.types.rulebased" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appinfo>
+         <meta.schema plugin="org.eclipse.papyrus.infra.types.rulebased" id="ruleKind" name="Rule Extension Point"/>
+      </appinfo>
+      <documentation>
+         Extension point to describe new rule kinds.
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
+      <complexType>
+         <sequence>
+            <element ref="ruleKind"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute translatable="true"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="ruleKind">
+      <complexType>
+         <attribute name="configurationClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+         <attribute name="ruleClass" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule:"/>
+               </appinfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="since"/>
+      </appinfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="examples"/>
+      </appinfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="apiinfo"/>
+      </appinfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appinfo>
+         <meta.section type="implementation"/>
+      </appinfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/AndRuleConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/AndRuleConfiguration.java
new file mode 100644
index 00000000000..53077026b39
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/AndRuleConfiguration.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>And Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getAndRuleConfiguration()
+ * @model
+ * @generated
+ */
+public interface AndRuleConfiguration extends CompositeRuleConfiguration {
+} // AndRuleConfiguration
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/CompositeRuleConfiguration.java
index e739db406a8..edbe0f0f34c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/CompositeInvariantRuleConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/CompositeRuleConfiguration.java
@@ -1,50 +1,50 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration;

-

-import org.eclipse.emf.common.util.EList;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Composite Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration#getComposedRules <em>Composed Rules</em>}</li>

- * </ul>

- *

- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getCompositeInvariantRuleConfiguration()

- * @model abstract="true"

- * @generated

- */

-public interface CompositeInvariantRuleConfiguration extends InvariantRuleConfiguration {

-	/**

-	 * Returns the value of the '<em><b>Composed Rules</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Composed Rules</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Composed Rules</em>' containment reference list.

-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage#getCompositeInvariantRuleConfiguration_ComposedRules()

-	 * @model containment="true" lower="2"

-	 * @generated

-	 */

-	EList<InvariantRuleConfiguration> getComposedRules();

-

-} // CompositeInvariantRuleConfiguration

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Composite Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration#getComposedRules <em>Composed Rules</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getCompositeRuleConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CompositeRuleConfiguration extends RuleConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Composed Rules</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Composed Rules</em>' containment reference list.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getCompositeRuleConfiguration_ComposedRules()
+	 * @model containment="true" lower="2"
+	 * @generated
+	 */
+	EList<RuleConfiguration> getComposedRules();
+
+} // CompositeRuleConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/NotRuleConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/NotRuleConfiguration.java
new file mode 100644
index 00000000000..4618d0788fa
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/NotRuleConfiguration.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Not Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration#getComposedRule <em>Composed Rule</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getNotRuleConfiguration()
+ * @model
+ * @generated
+ */
+public interface NotRuleConfiguration extends RuleConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Composed Rule</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Composed Rule</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Composed Rule</em>' reference.
+	 * @see #setComposedRule(RuleConfiguration)
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getNotRuleConfiguration_ComposedRule()
+	 * @model required="true"
+	 * @generated
+	 */
+	RuleConfiguration getComposedRule();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration#getComposedRule <em>Composed Rule</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Composed Rule</em>' reference.
+	 * @see #getComposedRule()
+	 * @generated
+	 */
+	void setComposedRule(RuleConfiguration value);
+
+} // NotRuleConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/OrRuleConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/OrRuleConfiguration.java
new file mode 100644
index 00000000000..42cddc5095f
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/OrRuleConfiguration.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Or Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getOrRuleConfiguration()
+ * @model
+ * @generated
+ */
+public interface OrRuleConfiguration extends CompositeRuleConfiguration {
+} // OrRuleConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedFactory.java
new file mode 100644
index 00000000000..b7f383563f5
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedFactory.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage
+ * @generated
+ */
+public interface RuleBasedFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RuleBasedFactory eINSTANCE = org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Type Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Type Configuration</em>'.
+	 * @generated
+	 */
+	RuleBasedTypeConfiguration createRuleBasedTypeConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Not Rule Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Not Rule Configuration</em>'.
+	 * @generated
+	 */
+	NotRuleConfiguration createNotRuleConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>And Rule Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>And Rule Configuration</em>'.
+	 * @generated
+	 */
+	AndRuleConfiguration createAndRuleConfiguration();
+
+	/**
+	 * Returns a new object of class '<em>Or Rule Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Or Rule Configuration</em>'.
+	 * @generated
+	 */
+	OrRuleConfiguration createOrRuleConfiguration();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	RuleBasedPackage getRuleBasedPackage();
+
+} //RuleBasedFactory
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
new file mode 100644
index 00000000000..331b485f2b0
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedPackage.java
@@ -0,0 +1,576 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface RuleBasedPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "rulebased";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/papyrus/infra/types/rulebased/1.1";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "rulebased";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	RuleBasedPackage eINSTANCE = org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedTypeConfigurationImpl <em>Type Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getRuleBasedTypeConfiguration()
+	 * @generated
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__DESCRIPTION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__IDENTIFIER = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__IDENTIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__NAME = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Hint</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__HINT = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__HINT;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__KIND = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__KIND;
+
+	/**
+	 * The feature id for the '<em><b>Icon Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__ICON_ENTRY = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__ICON_ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Specialized Types ID</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID;
+
+	/**
+	 * The feature id for the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION;
+
+	/**
+	 * The feature id for the '<em><b>Rule Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION_FEATURE_COUNT = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Type Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_BASED_TYPE_CONFIGURATION_OPERATION_COUNT = ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.RuleConfigurationImpl <em>Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getRuleConfiguration()
+	 * @generated
+	 */
+	int RULE_CONFIGURATION = 1;
+
+	/**
+	 * The number of structural features of the '<em>Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_CONFIGURATION_FEATURE_COUNT = 0;
+
+	/**
+	 * The number of operations of the '<em>Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RULE_CONFIGURATION_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.CompositeRuleConfigurationImpl <em>Composite Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.CompositeRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getCompositeRuleConfiguration()
+	 * @generated
+	 */
+	int COMPOSITE_RULE_CONFIGURATION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES = RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Composite Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_RULE_CONFIGURATION_FEATURE_COUNT = RULE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Composite Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMPOSITE_RULE_CONFIGURATION_OPERATION_COUNT = RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.NotRuleConfigurationImpl <em>Not Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.NotRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getNotRuleConfiguration()
+	 * @generated
+	 */
+	int NOT_RULE_CONFIGURATION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rule</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NOT_RULE_CONFIGURATION__COMPOSED_RULE = RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Not Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NOT_RULE_CONFIGURATION_FEATURE_COUNT = RULE_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Not Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NOT_RULE_CONFIGURATION_OPERATION_COUNT = RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.AndRuleConfigurationImpl <em>And Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.AndRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getAndRuleConfiguration()
+	 * @generated
+	 */
+	int AND_RULE_CONFIGURATION = 4;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AND_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES;
+
+	/**
+	 * The number of structural features of the '<em>And Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AND_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>And Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int AND_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.OrRuleConfigurationImpl <em>Or Rule Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.OrRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getOrRuleConfiguration()
+	 * @generated
+	 */
+	int OR_RULE_CONFIGURATION = 5;
+
+	/**
+	 * The feature id for the '<em><b>Composed Rules</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OR_RULE_CONFIGURATION__COMPOSED_RULES = COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES;
+
+	/**
+	 * The number of structural features of the '<em>Or Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OR_RULE_CONFIGURATION_FEATURE_COUNT = COMPOSITE_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Or Rule Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OR_RULE_CONFIGURATION_OPERATION_COUNT = COMPOSITE_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration <em>Type Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Type Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration
+	 * @generated
+	 */
+	EClass getRuleBasedTypeConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration#getRuleConfiguration <em>Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration#getRuleConfiguration()
+	 * @see #getRuleBasedTypeConfiguration()
+	 * @generated
+	 */
+	EReference getRuleBasedTypeConfiguration_RuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration <em>Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration
+	 * @generated
+	 */
+	EClass getRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration <em>Composite Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Composite Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration
+	 * @generated
+	 */
+	EClass getCompositeRuleConfiguration();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration#getComposedRules <em>Composed Rules</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Composed Rules</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration#getComposedRules()
+	 * @see #getCompositeRuleConfiguration()
+	 * @generated
+	 */
+	EReference getCompositeRuleConfiguration_ComposedRules();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration <em>Not Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Not Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration
+	 * @generated
+	 */
+	EClass getNotRuleConfiguration();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration#getComposedRule <em>Composed Rule</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Composed Rule</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration#getComposedRule()
+	 * @see #getNotRuleConfiguration()
+	 * @generated
+	 */
+	EReference getNotRuleConfiguration_ComposedRule();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration <em>And Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>And Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration
+	 * @generated
+	 */
+	EClass getAndRuleConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration <em>Or Rule Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Or Rule Configuration</em>'.
+	 * @see org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration
+	 * @generated
+	 */
+	EClass getOrRuleConfiguration();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	RuleBasedFactory getRuleBasedFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedTypeConfigurationImpl <em>Type Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedTypeConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getRuleBasedTypeConfiguration()
+		 * @generated
+		 */
+		EClass RULE_BASED_TYPE_CONFIGURATION = eINSTANCE.getRuleBasedTypeConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Rule Configuration</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION = eINSTANCE.getRuleBasedTypeConfiguration_RuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.RuleConfigurationImpl <em>Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getRuleConfiguration()
+		 * @generated
+		 */
+		EClass RULE_CONFIGURATION = eINSTANCE.getRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.CompositeRuleConfigurationImpl <em>Composite Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.CompositeRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getCompositeRuleConfiguration()
+		 * @generated
+		 */
+		EClass COMPOSITE_RULE_CONFIGURATION = eINSTANCE.getCompositeRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Composed Rules</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES = eINSTANCE.getCompositeRuleConfiguration_ComposedRules();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.NotRuleConfigurationImpl <em>Not Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.NotRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getNotRuleConfiguration()
+		 * @generated
+		 */
+		EClass NOT_RULE_CONFIGURATION = eINSTANCE.getNotRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Composed Rule</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference NOT_RULE_CONFIGURATION__COMPOSED_RULE = eINSTANCE.getNotRuleConfiguration_ComposedRule();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.AndRuleConfigurationImpl <em>And Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.AndRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getAndRuleConfiguration()
+		 * @generated
+		 */
+		EClass AND_RULE_CONFIGURATION = eINSTANCE.getAndRuleConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.rulebased.impl.OrRuleConfigurationImpl <em>Or Rule Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.OrRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedPackageImpl#getOrRuleConfiguration()
+		 * @generated
+		 */
+		EClass OR_RULE_CONFIGURATION = eINSTANCE.getOrRuleConfiguration();
+
+	}
+
+} //RuleBasedPackage
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedTypeConfiguration.java
new file mode 100644
index 00000000000..3bfcbf47db3
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleBasedTypeConfiguration.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration#getRuleConfiguration <em>Rule Configuration</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getRuleBasedTypeConfiguration()
+ * @model
+ * @generated
+ */
+public interface RuleBasedTypeConfiguration extends SpecializationTypeConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Rule Configuration</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Rule Configuration</em>' containment reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Rule Configuration</em>' containment reference.
+	 * @see #setRuleConfiguration(RuleConfiguration)
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getRuleBasedTypeConfiguration_RuleConfiguration()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	RuleConfiguration getRuleConfiguration();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration#getRuleConfiguration <em>Rule Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Rule Configuration</em>' containment reference.
+	 * @see #getRuleConfiguration()
+	 * @generated
+	 */
+	void setRuleConfiguration(RuleConfiguration value);
+
+} // RuleBasedTypeConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleConfiguration.java
new file mode 100644
index 00000000000..6acb87349e8
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/RuleConfiguration.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#getRuleConfiguration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface RuleConfiguration extends EObject {
+} // RuleConfiguration
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/AndRuleConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/AndRuleConfigurationImpl.java
new file mode 100644
index 00000000000..324f3adcfd4
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/AndRuleConfigurationImpl.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>And Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AndRuleConfigurationImpl extends CompositeRuleConfigurationImpl implements AndRuleConfiguration {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AndRuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuleBasedPackage.Literals.AND_RULE_CONFIGURATION;
+	}
+
+} //AndRuleConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/CompositeRuleConfigurationImpl.java
index 89ff5932ff2..4baef63e4ae 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/CompositeInvariantRuleConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/CompositeRuleConfigurationImpl.java
@@ -1,160 +1,160 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.NotificationChain;

-

-import org.eclipse.emf.common.util.EList;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Composite Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.CompositeInvariantRuleConfigurationImpl#getComposedRules <em>Composed Rules</em>}</li>

- * </ul>

- *

- * @generated

- */

-public abstract class CompositeInvariantRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements CompositeInvariantRuleConfiguration {

-	/**

-	 * The cached value of the '{@link #getComposedRules() <em>Composed Rules</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getComposedRules()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<InvariantRuleConfiguration> composedRules;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected CompositeInvariantRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EList<InvariantRuleConfiguration> getComposedRules() {

-		if (composedRules == null) {

-			composedRules = new EObjectContainmentEList<InvariantRuleConfiguration>(InvariantRuleConfiguration.class, this, InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES);

-		}

-		return composedRules;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES:

-				return ((InternalEList<?>)getComposedRules()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES:

-				return getComposedRules();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES:

-				getComposedRules().clear();

-				getComposedRules().addAll((Collection<? extends InvariantRuleConfiguration>)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES:

-				getComposedRules().clear();

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES:

-				return composedRules != null && !composedRules.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-} //CompositeInvariantRuleConfigurationImpl

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Composite Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.rulebased.impl.CompositeRuleConfigurationImpl#getComposedRules <em>Composed Rules</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class CompositeRuleConfigurationImpl extends RuleConfigurationImpl implements CompositeRuleConfiguration {
+	/**
+	 * The cached value of the '{@link #getComposedRules() <em>Composed Rules</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getComposedRules()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<RuleConfiguration> composedRules;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CompositeRuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<RuleConfiguration> getComposedRules() {
+		if (composedRules == null) {
+			composedRules = new EObjectContainmentEList<RuleConfiguration>(RuleConfiguration.class, this, RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES);
+		}
+		return composedRules;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES:
+				return ((InternalEList<?>)getComposedRules()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES:
+				return getComposedRules();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES:
+				getComposedRules().clear();
+				getComposedRules().addAll((Collection<? extends RuleConfiguration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES:
+				getComposedRules().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES:
+				return composedRules != null && !composedRules.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CompositeRuleConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/NotRuleConfigurationImpl.java
index 686a074d39f..2ee6e4e0196 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/impl/NotInvariantRuleConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/NotRuleConfigurationImpl.java
@@ -1,166 +1,166 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Not Invariant Rule Configuration</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.NotInvariantRuleConfigurationImpl#getComposedRule <em>Composed Rule</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class NotInvariantRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements NotInvariantRuleConfiguration {

-	/**

-	 * The cached value of the '{@link #getComposedRule() <em>Composed Rule</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #getComposedRule()

-	 * @generated

-	 * @ordered

-	 */

-	protected InvariantRuleConfiguration composedRule;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NotInvariantRuleConfigurationImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantRuleConfiguration getComposedRule() {

-		if (composedRule != null && composedRule.eIsProxy()) {

-			InternalEObject oldComposedRule = (InternalEObject)composedRule;

-			composedRule = (InvariantRuleConfiguration)eResolveProxy(oldComposedRule);

-			if (composedRule != oldComposedRule) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE, oldComposedRule, composedRule));

-			}

-		}

-		return composedRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantRuleConfiguration basicGetComposedRule() {

-		return composedRule;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setComposedRule(InvariantRuleConfiguration newComposedRule) {

-		InvariantRuleConfiguration oldComposedRule = composedRule;

-		composedRule = newComposedRule;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE, oldComposedRule, composedRule));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE:

-				if (resolve) return getComposedRule();

-				return basicGetComposedRule();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE:

-				setComposedRule((InvariantRuleConfiguration)newValue);

-				return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE:

-				setComposedRule((InvariantRuleConfiguration)null);

-				return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE:

-				return composedRule != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-} //NotInvariantRuleConfigurationImpl

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Not Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.rulebased.impl.NotRuleConfigurationImpl#getComposedRule <em>Composed Rule</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NotRuleConfigurationImpl extends RuleConfigurationImpl implements NotRuleConfiguration {
+	/**
+	 * The cached value of the '{@link #getComposedRule() <em>Composed Rule</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getComposedRule()
+	 * @generated
+	 * @ordered
+	 */
+	protected RuleConfiguration composedRule;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NotRuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuleBasedPackage.Literals.NOT_RULE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleConfiguration getComposedRule() {
+		if (composedRule != null && composedRule.eIsProxy()) {
+			InternalEObject oldComposedRule = (InternalEObject)composedRule;
+			composedRule = (RuleConfiguration)eResolveProxy(oldComposedRule);
+			if (composedRule != oldComposedRule) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RuleBasedPackage.NOT_RULE_CONFIGURATION__COMPOSED_RULE, oldComposedRule, composedRule));
+			}
+		}
+		return composedRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleConfiguration basicGetComposedRule() {
+		return composedRule;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setComposedRule(RuleConfiguration newComposedRule) {
+		RuleConfiguration oldComposedRule = composedRule;
+		composedRule = newComposedRule;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RuleBasedPackage.NOT_RULE_CONFIGURATION__COMPOSED_RULE, oldComposedRule, composedRule));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case RuleBasedPackage.NOT_RULE_CONFIGURATION__COMPOSED_RULE:
+				if (resolve) return getComposedRule();
+				return basicGetComposedRule();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case RuleBasedPackage.NOT_RULE_CONFIGURATION__COMPOSED_RULE:
+				setComposedRule((RuleConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case RuleBasedPackage.NOT_RULE_CONFIGURATION__COMPOSED_RULE:
+				setComposedRule((RuleConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case RuleBasedPackage.NOT_RULE_CONFIGURATION__COMPOSED_RULE:
+				return composedRule != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //NotRuleConfigurationImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/OrRuleConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/OrRuleConfigurationImpl.java
new file mode 100644
index 00000000000..5cc23ccc9c7
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/OrRuleConfigurationImpl.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Or Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class OrRuleConfigurationImpl extends CompositeRuleConfigurationImpl implements OrRuleConfiguration {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OrRuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuleBasedPackage.Literals.OR_RULE_CONFIGURATION;
+	}
+
+} //OrRuleConfigurationImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedFactoryImpl.java
new file mode 100644
index 00000000000..3f1ad9a26cc
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedFactoryImpl.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.papyrus.infra.types.rulebased.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuleBasedFactoryImpl extends EFactoryImpl implements RuleBasedFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static RuleBasedFactory init() {
+		try {
+			RuleBasedFactory theRuleBasedFactory = (RuleBasedFactory)EPackage.Registry.INSTANCE.getEFactory(RuleBasedPackage.eNS_URI);
+			if (theRuleBasedFactory != null) {
+				return theRuleBasedFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new RuleBasedFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION: return createRuleBasedTypeConfiguration();
+			case RuleBasedPackage.NOT_RULE_CONFIGURATION: return createNotRuleConfiguration();
+			case RuleBasedPackage.AND_RULE_CONFIGURATION: return createAndRuleConfiguration();
+			case RuleBasedPackage.OR_RULE_CONFIGURATION: return createOrRuleConfiguration();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedTypeConfiguration createRuleBasedTypeConfiguration() {
+		RuleBasedTypeConfigurationImpl ruleBasedTypeConfiguration = new RuleBasedTypeConfigurationImpl();
+		return ruleBasedTypeConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotRuleConfiguration createNotRuleConfiguration() {
+		NotRuleConfigurationImpl notRuleConfiguration = new NotRuleConfigurationImpl();
+		return notRuleConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AndRuleConfiguration createAndRuleConfiguration() {
+		AndRuleConfigurationImpl andRuleConfiguration = new AndRuleConfigurationImpl();
+		return andRuleConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OrRuleConfiguration createOrRuleConfiguration() {
+		OrRuleConfigurationImpl orRuleConfiguration = new OrRuleConfigurationImpl();
+		return orRuleConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedPackage getRuleBasedPackage() {
+		return (RuleBasedPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static RuleBasedPackage getPackage() {
+		return RuleBasedPackage.eINSTANCE;
+	}
+
+} //RuleBasedFactoryImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedPackageImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedPackageImpl.java
new file mode 100644
index 00000000000..da56a83e86c
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedPackageImpl.java
@@ -0,0 +1,329 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedFactory;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuleBasedPackageImpl extends EPackageImpl implements RuleBasedPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass ruleBasedTypeConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass ruleConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass compositeRuleConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass notRuleConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass andRuleConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass orRuleConfigurationEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private RuleBasedPackageImpl() {
+		super(eNS_URI, RuleBasedFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link RuleBasedPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static RuleBasedPackage init() {
+		if (isInited) return (RuleBasedPackage)EPackage.Registry.INSTANCE.getEPackage(RuleBasedPackage.eNS_URI);
+
+		// Obtain or create and register package
+		RuleBasedPackageImpl theRuleBasedPackage = (RuleBasedPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RuleBasedPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RuleBasedPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theRuleBasedPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theRuleBasedPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theRuleBasedPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(RuleBasedPackage.eNS_URI, theRuleBasedPackage);
+		return theRuleBasedPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRuleBasedTypeConfiguration() {
+		return ruleBasedTypeConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRuleBasedTypeConfiguration_RuleConfiguration() {
+		return (EReference)ruleBasedTypeConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRuleConfiguration() {
+		return ruleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCompositeRuleConfiguration() {
+		return compositeRuleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCompositeRuleConfiguration_ComposedRules() {
+		return (EReference)compositeRuleConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getNotRuleConfiguration() {
+		return notRuleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getNotRuleConfiguration_ComposedRule() {
+		return (EReference)notRuleConfigurationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAndRuleConfiguration() {
+		return andRuleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOrRuleConfiguration() {
+		return orRuleConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedFactory getRuleBasedFactory() {
+		return (RuleBasedFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		ruleBasedTypeConfigurationEClass = createEClass(RULE_BASED_TYPE_CONFIGURATION);
+		createEReference(ruleBasedTypeConfigurationEClass, RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION);
+
+		ruleConfigurationEClass = createEClass(RULE_CONFIGURATION);
+
+		compositeRuleConfigurationEClass = createEClass(COMPOSITE_RULE_CONFIGURATION);
+		createEReference(compositeRuleConfigurationEClass, COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES);
+
+		notRuleConfigurationEClass = createEClass(NOT_RULE_CONFIGURATION);
+		createEReference(notRuleConfigurationEClass, NOT_RULE_CONFIGURATION__COMPOSED_RULE);
+
+		andRuleConfigurationEClass = createEClass(AND_RULE_CONFIGURATION);
+
+		orRuleConfigurationEClass = createEClass(OR_RULE_CONFIGURATION);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		ruleBasedTypeConfigurationEClass.getESuperTypes().add(theElementTypesConfigurationsPackage.getSpecializationTypeConfiguration());
+		compositeRuleConfigurationEClass.getESuperTypes().add(this.getRuleConfiguration());
+		notRuleConfigurationEClass.getESuperTypes().add(this.getRuleConfiguration());
+		andRuleConfigurationEClass.getESuperTypes().add(this.getCompositeRuleConfiguration());
+		orRuleConfigurationEClass.getESuperTypes().add(this.getCompositeRuleConfiguration());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(ruleBasedTypeConfigurationEClass, RuleBasedTypeConfiguration.class, "RuleBasedTypeConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRuleBasedTypeConfiguration_RuleConfiguration(), this.getRuleConfiguration(), null, "ruleConfiguration", null, 1, 1, RuleBasedTypeConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(ruleConfigurationEClass, RuleConfiguration.class, "RuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(compositeRuleConfigurationEClass, CompositeRuleConfiguration.class, "CompositeRuleConfiguration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCompositeRuleConfiguration_ComposedRules(), this.getRuleConfiguration(), null, "composedRules", null, 2, -1, CompositeRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(notRuleConfigurationEClass, NotRuleConfiguration.class, "NotRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getNotRuleConfiguration_ComposedRule(), this.getRuleConfiguration(), null, "composedRule", null, 1, 1, NotRuleConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(andRuleConfigurationEClass, AndRuleConfiguration.class, "AndRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(orRuleConfigurationEClass, OrRuleConfiguration.class, "OrRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
+
+} //RuleBasedPackageImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedTypeConfigurationImpl.java
new file mode 100644
index 00000000000..cdf10855473
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleBasedTypeConfigurationImpl.java
@@ -0,0 +1,187 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl;
+
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.infra.types.rulebased.impl.RuleBasedTypeConfigurationImpl#getRuleConfiguration <em>Rule Configuration</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RuleBasedTypeConfigurationImpl extends SpecializationTypeConfigurationImpl implements RuleBasedTypeConfiguration {
+	/**
+	 * The cached value of the '{@link #getRuleConfiguration() <em>Rule Configuration</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRuleConfiguration()
+	 * @generated
+	 * @ordered
+	 */
+	protected RuleConfiguration ruleConfiguration;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RuleBasedTypeConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleConfiguration getRuleConfiguration() {
+		return ruleConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetRuleConfiguration(RuleConfiguration newRuleConfiguration, NotificationChain msgs) {
+		RuleConfiguration oldRuleConfiguration = ruleConfiguration;
+		ruleConfiguration = newRuleConfiguration;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION, oldRuleConfiguration, newRuleConfiguration);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setRuleConfiguration(RuleConfiguration newRuleConfiguration) {
+		if (newRuleConfiguration != ruleConfiguration) {
+			NotificationChain msgs = null;
+			if (ruleConfiguration != null)
+				msgs = ((InternalEObject)ruleConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION, null, msgs);
+			if (newRuleConfiguration != null)
+				msgs = ((InternalEObject)newRuleConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION, null, msgs);
+			msgs = basicSetRuleConfiguration(newRuleConfiguration, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION, newRuleConfiguration, newRuleConfiguration));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION:
+				return basicSetRuleConfiguration(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION:
+				return getRuleConfiguration();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION:
+				setRuleConfiguration((RuleConfiguration)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION:
+				setRuleConfiguration((RuleConfiguration)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION:
+				return ruleConfiguration != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //RuleBasedTypeConfigurationImpl
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleConfigurationImpl.java
new file mode 100644
index 00000000000..087dd42c914
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/impl/RuleConfigurationImpl.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Rule Configuration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class RuleConfigurationImpl extends MinimalEObjectImpl.Container implements RuleConfiguration {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RuleConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return RuleBasedPackage.Literals.RULE_CONFIGURATION;
+	}
+
+} //RuleConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/OrInvariantRuleConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/AndRuleConfigurationItemProvider.java
index 6f4604c9291..35984c7dbd7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/OrInvariantRuleConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/AndRuleConfigurationItemProvider.java
@@ -1,104 +1,104 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class OrInvariantRuleConfigurationItemProvider extends CompositeInvariantRuleConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OrInvariantRuleConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns OrInvariantRuleConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OrInvariantRuleConfiguration"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_OrInvariantRuleConfiguration_type");

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class AndRuleConfigurationItemProvider extends CompositeRuleConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AndRuleConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns AndRuleConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AndRuleConfiguration"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_AndRuleConfiguration_type");
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/CompositeRuleConfigurationItemProvider.java
index 11a47f0f30e..589703539b9 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/CompositeInvariantRuleConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/CompositeRuleConfigurationItemProvider.java
@@ -1,151 +1,151 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class CompositeInvariantRuleConfigurationItemProvider extends InvariantRuleConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public CompositeInvariantRuleConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_CompositeInvariantRuleConfiguration_type");

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(CompositeInvariantRuleConfiguration.class)) {

-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createNotInvariantRuleConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createAndInvariantRuleConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createOrInvariantRuleConfiguration()));

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedFactory;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CompositeRuleConfigurationItemProvider extends RuleConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositeRuleConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_CompositeRuleConfiguration_type");
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(CompositeRuleConfiguration.class)) {
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES,
+				 RuleBasedFactory.eINSTANCE.createNotRuleConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES,
+				 RuleBasedFactory.eINSTANCE.createAndRuleConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES,
+				 RuleBasedFactory.eINSTANCE.createOrRuleConfiguration()));
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/NotRuleConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/NotRuleConfigurationItemProvider.java
new file mode 100644
index 00000000000..181fac1c9f4
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/NotRuleConfigurationItemProvider.java
@@ -0,0 +1,130 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class NotRuleConfigurationItemProvider extends RuleConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotRuleConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addComposedRulePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Composed Rule feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addComposedRulePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_NotRuleConfiguration_composedRule_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_NotRuleConfiguration_composedRule_feature", "_UI_NotRuleConfiguration_type"),
+				 RuleBasedPackage.Literals.NOT_RULE_CONFIGURATION__COMPOSED_RULE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns NotRuleConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/NotRuleConfiguration"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_NotRuleConfiguration_type");
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/OrRuleConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/OrRuleConfigurationItemProvider.java
new file mode 100644
index 00000000000..40469d417db
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/OrRuleConfigurationItemProvider.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class OrRuleConfigurationItemProvider extends CompositeRuleConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OrRuleConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns OrRuleConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/OrRuleConfiguration"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_OrRuleConfiguration_type");
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationEditPlugin.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleBasedEditPlugin.java
index c86f9f7d80c..e85255ce36b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationEditPlugin.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleBasedEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider;
+package org.eclipse.papyrus.infra.types.rulebased.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -18,22 +18,22 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 /**
- * This is the central singleton for the SetTypeAdviceConfiguration edit plugin.
+ * This is the central singleton for the RuleBased edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public final class SetTypeAdviceConfigurationEditPlugin extends EMFPlugin {
+public final class RuleBasedEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final SetTypeAdviceConfigurationEditPlugin INSTANCE = new SetTypeAdviceConfigurationEditPlugin();
+	public static final RuleBasedEditPlugin INSTANCE = new RuleBasedEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -49,11 +49,11 @@ public final class SetTypeAdviceConfigurationEditPlugin extends EMFPlugin {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetTypeAdviceConfigurationEditPlugin() {
+	public RuleBasedEditPlugin() {
 		super
 		  (new ResourceLocator [] {
 		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
 		   });
 	}
 
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleBasedItemProviderAdapterFactory.java
index 9a09ee82245..8b48ad5a0f5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProviderAdapterFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleBasedItemProviderAdapterFactory.java
@@ -1,422 +1,422 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.Notifier;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.ecore.EObject;

-

-import org.eclipse.emf.edit.command.CommandParameter;

-

-import org.eclipse.emf.edit.domain.EditingDomain;

-

-import org.eclipse.emf.edit.provider.ChangeNotifier;

-import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.IChangeNotifier;

-import org.eclipse.emf.edit.provider.IChildCreationExtender;

-import org.eclipse.emf.edit.provider.IDisposable;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.INotifyChangedListener;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationAdapterFactory;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;

-

-/**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class InvariantTypeConfigurationItemProviderAdapterFactory extends InvariantTypeConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {

-	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ComposedAdapterFactory parentAdapterFactory;

-

-	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IChangeNotifier changeNotifier = new ChangeNotifier();

-

-	/**

-	 * This helps manage the child creation extenders.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(InvariantTypeConfigurationEditPlugin.INSTANCE, InvariantTypeConfigurationPackage.eNS_URI);

-

-	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected Collection<Object> supportedTypes = new ArrayList<Object>();

-

-	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationItemProviderAdapterFactory() {

-		supportedTypes.add(IEditingDomainItemProvider.class);

-		supportedTypes.add(IStructuredItemContentProvider.class);

-		supportedTypes.add(ITreeItemContentProvider.class);

-		supportedTypes.add(IItemLabelProvider.class);

-		supportedTypes.add(IItemPropertySource.class);

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected InvariantTypeConfigurationItemProvider invariantTypeConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createInvariantTypeConfigurationAdapter() {

-		if (invariantTypeConfigurationItemProvider == null) {

-			invariantTypeConfigurationItemProvider = new InvariantTypeConfigurationItemProvider(this);

-		}

-

-		return invariantTypeConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected NotInvariantRuleConfigurationItemProvider notInvariantRuleConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createNotInvariantRuleConfigurationAdapter() {

-		if (notInvariantRuleConfigurationItemProvider == null) {

-			notInvariantRuleConfigurationItemProvider = new NotInvariantRuleConfigurationItemProvider(this);

-		}

-

-		return notInvariantRuleConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected AndInvariantRuleConfigurationItemProvider andInvariantRuleConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createAndInvariantRuleConfigurationAdapter() {

-		if (andInvariantRuleConfigurationItemProvider == null) {

-			andInvariantRuleConfigurationItemProvider = new AndInvariantRuleConfigurationItemProvider(this);

-		}

-

-		return andInvariantRuleConfigurationItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected OrInvariantRuleConfigurationItemProvider orInvariantRuleConfigurationItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createOrInvariantRuleConfigurationAdapter() {

-		if (orInvariantRuleConfigurationItemProvider == null) {

-			orInvariantRuleConfigurationItemProvider = new OrInvariantRuleConfigurationItemProvider(this);

-		}

-

-		return orInvariantRuleConfigurationItemProvider;

-	}

-

-	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ComposeableAdapterFactory getRootAdapterFactory() {

-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

-	}

-

-	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

-		this.parentAdapterFactory = parentAdapterFactory;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object type) {

-		return supportedTypes.contains(type) || super.isFactoryForType(type);

-	}

-

-	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter adapt(Notifier notifier, Object type) {

-		return super.adapt(notifier, this);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object adapt(Object object, Object type) {

-		if (isFactoryForType(type)) {

-			Object adapter = super.adapt(object, type);

-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

-				return adapter;

-			}

-		}

-

-		return null;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public List<IChildCreationExtender> getChildCreationExtenders() {

-		return childCreationExtenderManager.getChildCreationExtenders();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {

-		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ResourceLocator getResourceLocator() {

-		return childCreationExtenderManager;

-	}

-

-	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void addListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.addListener(notifyChangedListener);

-	}

-

-	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void removeListener(INotifyChangedListener notifyChangedListener) {

-		changeNotifier.removeListener(notifyChangedListener);

-	}

-

-	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void fireNotifyChanged(Notification notification) {

-		changeNotifier.fireNotifyChanged(notification);

-

-		if (parentAdapterFactory != null) {

-			parentAdapterFactory.fireNotifyChanged(notification);

-		}

-	}

-

-	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void dispose() {

-		if (invariantTypeConfigurationItemProvider != null) invariantTypeConfigurationItemProvider.dispose();

-		if (notInvariantRuleConfigurationItemProvider != null) notInvariantRuleConfigurationItemProvider.dispose();

-		if (andInvariantRuleConfigurationItemProvider != null) andInvariantRuleConfigurationItemProvider.dispose();

-		if (orInvariantRuleConfigurationItemProvider != null) orInvariantRuleConfigurationItemProvider.dispose();

-	}

-

-	/**

-	 * A child creation extender for the {@link ElementtypesconfigurationsPackage}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {

-		/**

-		 * The switch for creating child descriptors specific to each extended class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {

-			/**

-			 * The child descriptors being populated.

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 * @generated

-			 */

-			protected List<Object> newChildDescriptors;

-

-			/**

-			 * The domain in which to create the children.

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 * @generated

-			 */

-			protected EditingDomain editingDomain;

-

-			/**

-			 * Creates the a switch for populating child descriptors in the given domain.

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 * @generated

-			 */

-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {

-				this.newChildDescriptors = newChildDescriptors;

-				this.editingDomain = editingDomain;

-			}

-			/**

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 * @generated

-			 */

-			@Override

-			public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {

-				newChildDescriptors.add

-					(createChildParameter

-						(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,

-						 InvariantTypeConfigurationFactory.eINSTANCE.createInvariantTypeConfiguration()));

-

-				return null;

-			}

- 

-			/**

-			 * <!-- begin-user-doc -->

-			 * <!-- end-user-doc -->

-			 * @generated

-			 */

-			protected CommandParameter createChildParameter(Object feature, Object child) {

-				return new CommandParameter(null, feature, child);

-			}

-

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {

-			ArrayList<Object> result = new ArrayList<Object>();

-			new CreationSwitch(result, editingDomain).doSwitch((EObject)object);

-			return result;

-		}

-

-		/**

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		public ResourceLocator getResourceLocator() {

-			return InvariantTypeConfigurationEditPlugin.INSTANCE;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.edit.command.CommandParameter;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedFactory;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+
+import org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedAdapterFactory;
+
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsSwitch;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuleBasedItemProviderAdapterFactory extends RuleBasedAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This helps manage the child creation extenders.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(RuleBasedEditPlugin.INSTANCE, RuleBasedPackage.eNS_URI);
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RuleBasedTypeConfigurationItemProvider ruleBasedTypeConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createRuleBasedTypeConfigurationAdapter() {
+		if (ruleBasedTypeConfigurationItemProvider == null) {
+			ruleBasedTypeConfigurationItemProvider = new RuleBasedTypeConfigurationItemProvider(this);
+		}
+
+		return ruleBasedTypeConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NotRuleConfigurationItemProvider notRuleConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createNotRuleConfigurationAdapter() {
+		if (notRuleConfigurationItemProvider == null) {
+			notRuleConfigurationItemProvider = new NotRuleConfigurationItemProvider(this);
+		}
+
+		return notRuleConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AndRuleConfigurationItemProvider andRuleConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAndRuleConfigurationAdapter() {
+		if (andRuleConfigurationItemProvider == null) {
+			andRuleConfigurationItemProvider = new AndRuleConfigurationItemProvider(this);
+		}
+
+		return andRuleConfigurationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OrRuleConfigurationItemProvider orRuleConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createOrRuleConfigurationAdapter() {
+		if (orRuleConfigurationItemProvider == null) {
+			orRuleConfigurationItemProvider = new OrRuleConfigurationItemProvider(this);
+		}
+
+		return orRuleConfigurationItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public List<IChildCreationExtender> getChildCreationExtenders() {
+		return childCreationExtenderManager.getChildCreationExtenders();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ResourceLocator getResourceLocator() {
+		return childCreationExtenderManager;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (ruleBasedTypeConfigurationItemProvider != null) ruleBasedTypeConfigurationItemProvider.dispose();
+		if (notRuleConfigurationItemProvider != null) notRuleConfigurationItemProvider.dispose();
+		if (andRuleConfigurationItemProvider != null) andRuleConfigurationItemProvider.dispose();
+		if (orRuleConfigurationItemProvider != null) orRuleConfigurationItemProvider.dispose();
+	}
+
+	/**
+	 * A child creation extender for the {@link ElementTypesConfigurationsPackage}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class ElementTypesConfigurationsChildCreationExtender implements IChildCreationExtender {
+		/**
+		 * The switch for creating child descriptors specific to each extended class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected static class CreationSwitch extends ElementTypesConfigurationsSwitch<Object> {
+			/**
+			 * The child descriptors being populated.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected List<Object> newChildDescriptors;
+
+			/**
+			 * The domain in which to create the children.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected EditingDomain editingDomain;
+
+			/**
+			 * Creates the a switch for populating child descriptors in the given domain.
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+				this.newChildDescriptors = newChildDescriptors;
+				this.editingDomain = editingDomain;
+			}
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			@Override
+			public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
+				newChildDescriptors.add
+					(createChildParameter
+						(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS,
+						 RuleBasedFactory.eINSTANCE.createRuleBasedTypeConfiguration()));
+
+				return null;
+			}
+ 
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected CommandParameter createChildParameter(Object feature, Object child) {
+				return new CommandParameter(null, feature, child);
+			}
+
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+			ArrayList<Object> result = new ArrayList<Object>();
+			new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
+			return result;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public ResourceLocator getResourceLocator() {
+			return RuleBasedEditPlugin.INSTANCE;
+		}
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleBasedTypeConfigurationItemProvider.java
index 6206716bea6..5dc10ed7f56 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantTypeConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleBasedTypeConfigurationItemProvider.java
@@ -1,167 +1,167 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationFactory;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;

-

-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.SpecializationTypeConfigurationItemProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class InvariantTypeConfigurationItemProvider extends SpecializationTypeConfigurationItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantTypeConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns InvariantTypeConfiguration.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvariantTypeConfiguration"));

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((InvariantTypeConfiguration)object).getName();

-		return label == null || label.length() == 0 ?

-			getString("_UI_InvariantTypeConfiguration_type") :

-			getString("_UI_InvariantTypeConfiguration_type") + " " + label;

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(InvariantTypeConfiguration.class)) {

-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION:

-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-				return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createNotInvariantRuleConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createAndInvariantRuleConfiguration()));

-

-		newChildDescriptors.add

-			(createChildParameter

-				(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,

-				 InvariantTypeConfigurationFactory.eINSTANCE.createOrInvariantRuleConfiguration()));

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.papyrus.infra.types.provider.SpecializationTypeConfigurationItemProvider;
+
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedFactory;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuleBasedTypeConfigurationItemProvider extends SpecializationTypeConfigurationItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedTypeConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns RuleBasedTypeConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/RuleBasedTypeConfiguration"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((RuleBasedTypeConfiguration)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_RuleBasedTypeConfiguration_type") :
+			getString("_UI_RuleBasedTypeConfiguration_type") + " " + label;
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(RuleBasedTypeConfiguration.class)) {
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION,
+				 RuleBasedFactory.eINSTANCE.createNotRuleConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION,
+				 RuleBasedFactory.eINSTANCE.createAndRuleConfiguration()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION,
+				 RuleBasedFactory.eINSTANCE.createOrRuleConfiguration()));
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleConfigurationItemProvider.java
index bd0dad2f75b..647c70b91fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/provider/InvariantRuleConfigurationItemProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/provider/RuleConfigurationItemProvider.java
@@ -1,120 +1,120 @@
-/**

- * Copyright (c) 2014 CEA LIST.

- * 

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *  CEA LIST - Initial API and implementation

- */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.common.util.ResourceLocator;

-

-import org.eclipse.emf.edit.provider.IChildCreationExtender;

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-import org.eclipse.emf.edit.provider.ItemProviderAdapter;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class InvariantRuleConfigurationItemProvider 

-	extends ItemProviderAdapter

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InvariantRuleConfigurationItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		return getString("_UI_InvariantRuleConfiguration_type");

-	}

-	

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-	/**

-	 * Return the resource locator for this item provider's resources.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getResourceLocator() {

-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();

-	}

-

-}

+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class RuleConfigurationItemProvider 
+	extends ItemProviderAdapter
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_RuleConfiguration_type");
+	}
+	
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
+	}
+
+}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedAdapterFactory.java
index 9a657332b20..f1d94292dc2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationAdapterFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util;
+package org.eclipse.papyrus.infra.types.rulebased.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,30 +19,30 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.NamedConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;
+import org.eclipse.papyrus.infra.types.rulebased.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage
  * @generated
  */
-public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl {
+public class RuleBasedAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static InvariantTypeConfigurationPackage modelPackage;
+	protected static RuleBasedPackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -50,9 +50,9 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantTypeConfigurationAdapterFactory() {
+	public RuleBasedAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = InvariantTypeConfigurationPackage.eINSTANCE;
+			modelPackage = RuleBasedPackage.eINSTANCE;
 		}
 	}
 
@@ -81,31 +81,31 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected InvariantTypeConfigurationSwitch<Adapter> modelSwitch =
-		new InvariantTypeConfigurationSwitch<Adapter>() {
+	protected RuleBasedSwitch<Adapter> modelSwitch =
+		new RuleBasedSwitch<Adapter>() {
 			@Override
-			public Adapter caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {
-				return createInvariantTypeConfigurationAdapter();
+			public Adapter caseRuleBasedTypeConfiguration(RuleBasedTypeConfiguration object) {
+				return createRuleBasedTypeConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-				return createInvariantRuleConfigurationAdapter();
+			public Adapter caseRuleConfiguration(RuleConfiguration object) {
+				return createRuleConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {
-				return createCompositeInvariantRuleConfigurationAdapter();
+			public Adapter caseCompositeRuleConfiguration(CompositeRuleConfiguration object) {
+				return createCompositeRuleConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
-				return createNotInvariantRuleConfigurationAdapter();
+			public Adapter caseNotRuleConfiguration(NotRuleConfiguration object) {
+				return createNotRuleConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseAndInvariantRuleConfiguration(AndInvariantRuleConfiguration object) {
-				return createAndInvariantRuleConfigurationAdapter();
+			public Adapter caseAndRuleConfiguration(AndRuleConfiguration object) {
+				return createAndRuleConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseOrInvariantRuleConfiguration(OrInvariantRuleConfiguration object) {
-				return createOrInvariantRuleConfigurationAdapter();
+			public Adapter caseOrRuleConfiguration(OrRuleConfiguration object) {
+				return createOrRuleConfigurationAdapter();
 			}
 			@Override
 			public Adapter caseConfigurationElement(ConfigurationElement object) {
@@ -148,97 +148,97 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration <em>Invariant Type Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration <em>Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration
 	 * @generated
 	 */
-	public Adapter createInvariantTypeConfigurationAdapter() {
+	public Adapter createRuleBasedTypeConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration <em>Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration
 	 * @generated
 	 */
-	public Adapter createInvariantRuleConfigurationAdapter() {
+	public Adapter createRuleConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration <em>Composite Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration <em>Composite Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration
 	 * @generated
 	 */
-	public Adapter createCompositeInvariantRuleConfigurationAdapter() {
+	public Adapter createCompositeRuleConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration <em>Not Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration <em>Not Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration
 	 * @generated
 	 */
-	public Adapter createNotInvariantRuleConfigurationAdapter() {
+	public Adapter createNotRuleConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration <em>And Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration <em>And Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration
 	 * @generated
 	 */
-	public Adapter createAndInvariantRuleConfigurationAdapter() {
+	public Adapter createAndRuleConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration <em>Or Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration <em>Or Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration
 	 * @generated
 	 */
-	public Adapter createOrInvariantRuleConfigurationAdapter() {
+	public Adapter createOrRuleConfigurationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	public Adapter createConfigurationElementAdapter() {
@@ -246,13 +246,13 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	public Adapter createIdentifiedConfigurationAdapter() {
@@ -260,13 +260,13 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.NamedConfiguration
 	 * @generated
 	 */
 	public Adapter createNamedConfigurationAdapter() {
@@ -274,13 +274,13 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 	 * @generated
 	 */
 	public Adapter createElementTypeConfigurationAdapter() {
@@ -288,13 +288,13 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration
 	 * @generated
 	 */
 	public Adapter createSpecializationTypeConfigurationAdapter() {
@@ -313,4 +313,4 @@ public class InvariantTypeConfigurationAdapterFactory extends AdapterFactoryImpl
 		return null;
 	}
 
-} //InvariantTypeConfigurationAdapterFactory
+} //RuleBasedAdapterFactory
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedResourceFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedResourceFactoryImpl.java
new file mode 100644
index 00000000000..2168e497e8c
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedResourceFactoryImpl.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.infra.types.rulebased.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedResourceImpl
+ * @generated
+ */
+public class RuleBasedResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RuleBasedResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new RuleBasedResourceImpl(uri);
+		return result;
+	}
+
+} //RuleBasedResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedResourceImpl.java
index f22bdb13a97..c16891a88e3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/invariantcontainerruleconfiguration/util/InvariantContainerRuleConfigurationResourceImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util;
+package org.eclipse.papyrus.infra.types.rulebased.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.invariantcontainerruleconfiguration.util.InvariantContainerRuleConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedResourceFactoryImpl
  * @generated
  */
-public class InvariantContainerRuleConfigurationResourceImpl extends XMIResourceImpl {
+public class RuleBasedResourceImpl extends XMIResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
@@ -31,8 +31,8 @@ public class InvariantContainerRuleConfigurationResourceImpl extends XMIResource
 	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
-	public InvariantContainerRuleConfigurationResourceImpl(URI uri) {
+	public RuleBasedResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //InvariantContainerRuleConfigurationResourceImpl
+} //RuleBasedResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedSwitch.java
index 7b2516affad..f51598a36ff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypeconfiguration/util/InvariantTypeConfigurationSwitch.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src-gen/org/eclipse/papyrus/infra/types/rulebased/util/RuleBasedSwitch.java
@@ -10,20 +10,20 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util;
+package org.eclipse.papyrus.infra.types.rulebased.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.NamedConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.*;
+import org.eclipse.papyrus.infra.types.rulebased.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,17 +35,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage
+ * @see org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage
  * @generated
  */
-public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
+public class RuleBasedSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static InvariantTypeConfigurationPackage modelPackage;
+	protected static RuleBasedPackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -53,9 +53,9 @@ public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public InvariantTypeConfigurationSwitch() {
+	public RuleBasedSwitch() {
 		if (modelPackage == null) {
-			modelPackage = InvariantTypeConfigurationPackage.eINSTANCE;
+			modelPackage = RuleBasedPackage.eINSTANCE;
 		}
 	}
 
@@ -82,50 +82,50 @@ public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case InvariantTypeConfigurationPackage.INVARIANT_TYPE_CONFIGURATION: {
-				InvariantTypeConfiguration invariantTypeConfiguration = (InvariantTypeConfiguration)theEObject;
-				T result = caseInvariantTypeConfiguration(invariantTypeConfiguration);
-				if (result == null) result = caseSpecializationTypeConfiguration(invariantTypeConfiguration);
-				if (result == null) result = caseElementTypeConfiguration(invariantTypeConfiguration);
-				if (result == null) result = caseConfigurationElement(invariantTypeConfiguration);
-				if (result == null) result = caseIdentifiedConfiguration(invariantTypeConfiguration);
-				if (result == null) result = caseNamedConfiguration(invariantTypeConfiguration);
+			case RuleBasedPackage.RULE_BASED_TYPE_CONFIGURATION: {
+				RuleBasedTypeConfiguration ruleBasedTypeConfiguration = (RuleBasedTypeConfiguration)theEObject;
+				T result = caseRuleBasedTypeConfiguration(ruleBasedTypeConfiguration);
+				if (result == null) result = caseSpecializationTypeConfiguration(ruleBasedTypeConfiguration);
+				if (result == null) result = caseElementTypeConfiguration(ruleBasedTypeConfiguration);
+				if (result == null) result = caseConfigurationElement(ruleBasedTypeConfiguration);
+				if (result == null) result = caseIdentifiedConfiguration(ruleBasedTypeConfiguration);
+				if (result == null) result = caseNamedConfiguration(ruleBasedTypeConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION: {
-				InvariantRuleConfiguration invariantRuleConfiguration = (InvariantRuleConfiguration)theEObject;
-				T result = caseInvariantRuleConfiguration(invariantRuleConfiguration);
+			case RuleBasedPackage.RULE_CONFIGURATION: {
+				RuleConfiguration ruleConfiguration = (RuleConfiguration)theEObject;
+				T result = caseRuleConfiguration(ruleConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InvariantTypeConfigurationPackage.COMPOSITE_INVARIANT_RULE_CONFIGURATION: {
-				CompositeInvariantRuleConfiguration compositeInvariantRuleConfiguration = (CompositeInvariantRuleConfiguration)theEObject;
-				T result = caseCompositeInvariantRuleConfiguration(compositeInvariantRuleConfiguration);
-				if (result == null) result = caseInvariantRuleConfiguration(compositeInvariantRuleConfiguration);
+			case RuleBasedPackage.COMPOSITE_RULE_CONFIGURATION: {
+				CompositeRuleConfiguration compositeRuleConfiguration = (CompositeRuleConfiguration)theEObject;
+				T result = caseCompositeRuleConfiguration(compositeRuleConfiguration);
+				if (result == null) result = caseRuleConfiguration(compositeRuleConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InvariantTypeConfigurationPackage.NOT_INVARIANT_RULE_CONFIGURATION: {
-				NotInvariantRuleConfiguration notInvariantRuleConfiguration = (NotInvariantRuleConfiguration)theEObject;
-				T result = caseNotInvariantRuleConfiguration(notInvariantRuleConfiguration);
-				if (result == null) result = caseInvariantRuleConfiguration(notInvariantRuleConfiguration);
+			case RuleBasedPackage.NOT_RULE_CONFIGURATION: {
+				NotRuleConfiguration notRuleConfiguration = (NotRuleConfiguration)theEObject;
+				T result = caseNotRuleConfiguration(notRuleConfiguration);
+				if (result == null) result = caseRuleConfiguration(notRuleConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InvariantTypeConfigurationPackage.AND_INVARIANT_RULE_CONFIGURATION: {
-				AndInvariantRuleConfiguration andInvariantRuleConfiguration = (AndInvariantRuleConfiguration)theEObject;
-				T result = caseAndInvariantRuleConfiguration(andInvariantRuleConfiguration);
-				if (result == null) result = caseCompositeInvariantRuleConfiguration(andInvariantRuleConfiguration);
-				if (result == null) result = caseInvariantRuleConfiguration(andInvariantRuleConfiguration);
+			case RuleBasedPackage.AND_RULE_CONFIGURATION: {
+				AndRuleConfiguration andRuleConfiguration = (AndRuleConfiguration)theEObject;
+				T result = caseAndRuleConfiguration(andRuleConfiguration);
+				if (result == null) result = caseCompositeRuleConfiguration(andRuleConfiguration);
+				if (result == null) result = caseRuleConfiguration(andRuleConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case InvariantTypeConfigurationPackage.OR_INVARIANT_RULE_CONFIGURATION: {
-				OrInvariantRuleConfiguration orInvariantRuleConfiguration = (OrInvariantRuleConfiguration)theEObject;
-				T result = caseOrInvariantRuleConfiguration(orInvariantRuleConfiguration);
-				if (result == null) result = caseCompositeInvariantRuleConfiguration(orInvariantRuleConfiguration);
-				if (result == null) result = caseInvariantRuleConfiguration(orInvariantRuleConfiguration);
+			case RuleBasedPackage.OR_RULE_CONFIGURATION: {
+				OrRuleConfiguration orRuleConfiguration = (OrRuleConfiguration)theEObject;
+				T result = caseOrRuleConfiguration(orRuleConfiguration);
+				if (result == null) result = caseCompositeRuleConfiguration(orRuleConfiguration);
+				if (result == null) result = caseRuleConfiguration(orRuleConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -134,92 +134,92 @@ public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Type Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Type Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Type Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Type Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {
+	public T caseRuleBasedTypeConfiguration(RuleBasedTypeConfiguration object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+	public T caseRuleConfiguration(RuleConfiguration object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Composite Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Composite Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Composite Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Composite Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {
+	public T caseCompositeRuleConfiguration(CompositeRuleConfiguration object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Not Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Not Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Not Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Not Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
+	public T caseNotRuleConfiguration(NotRuleConfiguration object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>And Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>And Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>And Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>And Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseAndInvariantRuleConfiguration(AndInvariantRuleConfiguration object) {
+	public T caseAndRuleConfiguration(AndRuleConfiguration object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Or Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Or Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Or Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Or Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseOrInvariantRuleConfiguration(OrInvariantRuleConfiguration object) {
+	public T caseOrRuleConfiguration(OrRuleConfiguration object) {
 		return null;
 	}
 
@@ -314,4 +314,4 @@ public class InvariantTypeConfigurationSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //InvariantTypeConfigurationSwitch
+} //RuleBasedSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/Activator.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/Activator.java
index c699672337c..a5974a13d2f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/Activator.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/Activator.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 485220
  *  
  /*****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;
+package org.eclipse.papyrus.infra.types.rulebased;
 
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.papyrus.infra.core.log.LogHelper;
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.types.rulebased"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java
index 8b8844c2480..9ebb7f76fd3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/AbstractInvariantRule.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/AbstractRule.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;

+package org.eclipse.papyrus.infra.types.rulebased.core;

 

 import java.util.ArrayList;

 import java.util.List;

@@ -25,10 +25,10 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;

+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

 

-public abstract class AbstractInvariantRule<T extends InvariantRuleConfiguration> implements IInvariantRule<T> {

+public abstract class AbstractRule<T extends RuleConfiguration> implements IRule<T> {

 	protected T invariantRuleConfiguration;

 

 	@Override

diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java
new file mode 100644
index 00000000000..7c1839c1e12
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRule.java
@@ -0,0 +1,57 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.types.rulebased.core;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

+

+public class DefaultRule implements IRule<RuleConfiguration> {

+

+

+

+	/**

+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

+	 *

+	 * @param request

+	 * @return

+	 */

+	@Override

+	public boolean approveRequest(IEditCommandRequest request) {

+		// TODO Auto-generated method stub

+		return true;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#init(org.eclipse.papyrus.infra.types.rulebasedtypes.InvariantRuleConfiguration)

+	 *

+	 * @param invariantRuleConfiguration

+	 */

+	@Override

+	public void init(RuleConfiguration invariantRuleConfiguration) {

+

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#matches(org.eclipse.emf.ecore.EObject)

+	 *

+	 * @param eObject

+	 * @return

+	 */

+	@Override

+	public boolean matches(EObject eObject) {

+		return true;

+	}

+

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleEditHelperAdvice.java
index ecb8635ea12..acc5746cf18 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/DefaultInvariantEditHelperAdvice.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleEditHelperAdvice.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+package org.eclipse.papyrus.infra.types.rulebased.core;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,23 +29,23 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.AndInvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.OrInvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.Activator;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
+import org.eclipse.papyrus.infra.types.rulebased.Activator;
+import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
 
 
-public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
+public class DefaultRuleEditHelperAdvice extends AbstractEditHelperAdvice {
 
 
 	@Override
 	public boolean approveRequest(IEditCommandRequest request) {
-		List<ConfiguredHintedSpecializationElementType> types = getInvariantTypes(request);
+		List<ConfiguredHintedSpecializationElementType> types = getTypes(request);
 
 		// Must approve from the whole hierarchy
 		for (ConfiguredHintedSpecializationElementType configuredHintedSpecializationElementType : types) {
@@ -61,11 +61,11 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * @param request
 	 * 
 	 */
-	protected List<ConfiguredHintedSpecializationElementType> getInvariantTypes(IEditCommandRequest request) {
+	protected List<ConfiguredHintedSpecializationElementType> getTypes(IEditCommandRequest request) {
 		List<ConfiguredHintedSpecializationElementType> result = new ArrayList<ConfiguredHintedSpecializationElementType>();
 		if (request instanceof CreateElementRequest) {
 			IElementType typeToCreate = ((CreateElementRequest) request).getElementType();
-			List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllInvariantTypes(typeToCreate);
+			List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllTypes(typeToCreate);
 			result.addAll(superConfiguredTypes);
 		} else if (request instanceof SetRequest) {
 			// check the feature to set is a containment feature and element to move is an extended element type
@@ -88,7 +88,7 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 							IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) object, request.getClientContext());
 							for (IElementType type : types) {
 								if (type instanceof ConfiguredHintedSpecializationElementType) {
-									if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) {
+									if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof RuleBasedTypeConfiguration) {
 										result.add((ConfiguredHintedSpecializationElementType) type);
 
 										List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) type);
@@ -108,7 +108,7 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching(movedElement.getKey(), request.getClientContext());
 				for (IElementType type : types) {
 					if (type instanceof ConfiguredHintedSpecializationElementType) {
-						if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) {
+						if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof RuleBasedTypeConfiguration) {
 							result.add((ConfiguredHintedSpecializationElementType) type);
 
 							List<ConfiguredHintedSpecializationElementType> superConfiguredTypes = getAllSuperConfiguredTypes((ConfiguredHintedSpecializationElementType) type);
@@ -127,10 +127,10 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 	 * Returns the list of types (this one and supers) that are configuredTypes.
 	 * 
 	 * @param type
-	 *            the type from which all invariants are retrieved
-	 * @return the list of invariant types in the hierarchy of specified type, including type itself if matching. Returns an empty list if none is matching
+	 *            the type from which all s are retrieved
+	 * @return the list of types in the hierarchy of specified type, including type itself if matching. Returns an empty list if none is matching
 	 */
-	protected List<ConfiguredHintedSpecializationElementType> getAllInvariantTypes(IElementType type) {
+	protected List<ConfiguredHintedSpecializationElementType> getAllTypes(IElementType type) {
 		List<ConfiguredHintedSpecializationElementType> result = new ArrayList<ConfiguredHintedSpecializationElementType>();
 
 		if (!(type instanceof ConfiguredHintedSpecializationElementType)) {
@@ -138,7 +138,7 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 			return result;
 		}
 
-		if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof InvariantTypeConfiguration) {
+		if (((ConfiguredHintedSpecializationElementType) type).getConfiguration() instanceof RuleBasedTypeConfiguration) {
 			result.add((ConfiguredHintedSpecializationElementType) type);
 		}
 
@@ -149,7 +149,7 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 		// get the reverse order
 		for (int i = superTypes.length - 1; i >= 0; i--) {
 			if (superTypes[i] instanceof ConfiguredHintedSpecializationElementType) {
-				if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof InvariantTypeConfiguration) {
+				if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof RuleBasedTypeConfiguration) {
 					result.add((ConfiguredHintedSpecializationElementType) superTypes[i]);
 				}
 			}
@@ -167,7 +167,7 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 		// get the reverse order
 		for (int i = superTypes.length - 1; i >= 0; i--) {
 			if (superTypes[i] instanceof ConfiguredHintedSpecializationElementType) {
-				if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof InvariantTypeConfiguration) {
+				if (((ConfiguredHintedSpecializationElementType) superTypes[i]).getConfiguration() instanceof RuleBasedTypeConfiguration) {
 					superExtendedTypes.add((ConfiguredHintedSpecializationElementType) superTypes[i]);
 				}
 			}
@@ -176,50 +176,50 @@ public class DefaultInvariantEditHelperAdvice extends AbstractEditHelperAdvice {
 	}
 
 
-	protected boolean processCompositeRule(CompositeInvariantRuleConfiguration compositeRule, IEditCommandRequest request) {
-		Iterator<InvariantRuleConfiguration> iterator = compositeRule.getComposedRules().iterator();
-		InvariantRuleConfiguration nextComposedRuleConfiguration = iterator.next();
-		boolean result = processInvariantRule(nextComposedRuleConfiguration, request);
-	
+	protected boolean processCompositeRule(CompositeRuleConfiguration compositeRule, IEditCommandRequest request) {
+		Iterator<RuleConfiguration> iterator = compositeRule.getComposedRules().iterator();
+		RuleConfiguration nextComposedRuleConfiguration = iterator.next();
+		boolean result = processRule(nextComposedRuleConfiguration, request);
+
 		while (iterator.hasNext()) {
 			nextComposedRuleConfiguration = iterator.next();
-	
-			boolean resultNextComposedRuleConfiguration = processInvariantRule(nextComposedRuleConfiguration, request);
-	
-			if (compositeRule instanceof OrInvariantRuleConfiguration) {
+
+			boolean resultNextComposedRuleConfiguration = processRule(nextComposedRuleConfiguration, request);
+
+			if (compositeRule instanceof OrRuleConfiguration) {
 				if (result == false && resultNextComposedRuleConfiguration) {
 					result = true;
 				}
-			} else if (compositeRule instanceof AndInvariantRuleConfiguration) {
+			} else if (compositeRule instanceof AndRuleConfiguration) {
 				if (result == true && !resultNextComposedRuleConfiguration) {
 					result = false;
 				}
 			}
 		}
-	
+
 		return result;
 	}
 
-	protected boolean processInvariantRule(InvariantRuleConfiguration invariantRuleConfiguration, IEditCommandRequest request) {
-		if (invariantRuleConfiguration instanceof CompositeInvariantRuleConfiguration) {
-			return processCompositeRule((CompositeInvariantRuleConfiguration) invariantRuleConfiguration, request);
-		} else if (invariantRuleConfiguration instanceof NotInvariantRuleConfiguration) {
-			InvariantRuleConfiguration composedRule = ((NotInvariantRuleConfiguration) invariantRuleConfiguration).getComposedRule();
-			return !processInvariantRule(composedRule, request);
+	protected boolean processRule(RuleConfiguration ruleConfiguration, IEditCommandRequest request) {
+		if (ruleConfiguration instanceof CompositeRuleConfiguration) {
+			return processCompositeRule((CompositeRuleConfiguration) ruleConfiguration, request);
+		} else if (ruleConfiguration instanceof NotRuleConfiguration) {
+			RuleConfiguration composedRule = ((NotRuleConfiguration) ruleConfiguration).getComposedRule();
+			return !processRule(composedRule, request);
 		} else {
-			return InvariantRuleConfigurationTypeRegistry.getInstance().getInvariantRule(invariantRuleConfiguration).approveRequest(request);
+			return RuleConfigurationTypeRegistry.getInstance().getRule(ruleConfiguration).approveRequest(request);
 		}
 	}
 
 	protected boolean approveRequest(ConfiguredHintedSpecializationElementType elementType, IEditCommandRequest request) {
 
 		ElementTypeConfiguration configuration = ((ConfiguredHintedSpecializationElementType) elementType).getConfiguration();
-		if (configuration instanceof InvariantTypeConfiguration) {
-			InvariantRuleConfiguration invariantRuleConfiguration = ((InvariantTypeConfiguration) configuration).getInvariantRuleConfiguration();
+		if (configuration instanceof RuleBasedTypeConfiguration) {
+			RuleConfiguration ruleConfiguration = ((RuleBasedTypeConfiguration) configuration).getRuleConfiguration();
 
-			return processInvariantRule(invariantRuleConfiguration, request);
+			return processRule(ruleConfiguration, request);
 		} else {
-			Activator.log.warn("Expected InvariantRuleConfiguration as configuration type for : " + elementType);
+			Activator.log.warn("Expected RuleConfiguration as configuration type for : " + elementType);
 		}
 
 		return true;
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java
new file mode 100644
index 00000000000..b34935fc85e
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/DefaultRuleElementMatcher.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * Copyright (c) 2015 CEA LIST and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   CEA LIST - Initial API and implementation

+ *   

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.types.rulebased.core;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.infra.types.rulebased.AndRuleConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.NotRuleConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.OrRuleConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

+

+

+public class DefaultRuleElementMatcher implements IElementMatcher {

+

+

+	RuleBasedTypeConfiguration configuration;

+

+	public DefaultRuleElementMatcher(RuleBasedTypeConfiguration configuration) {

+		this.configuration = configuration;

+	}

+

+	/**

+	 * @see org.eclipse.gmf.runtime.emf.type.core.IElementMatcher#matches(org.eclipse.emf.ecore.EObject)

+	 *

+	 * @param eObject

+	 * @return

+	 */

+	@Override

+	public boolean matches(EObject eObject) {

+		RuleConfiguration RuleConfiguration = configuration.getRuleConfiguration();

+

+		return processRule(RuleConfiguration, eObject);

+	}

+

+	/**

+	 * @param RuleConfiguration

+	 * @param eObject

+	 * @return

+	 */

+	protected boolean processRule(RuleConfiguration RuleConfiguration, EObject eObject) {

+		if (RuleConfiguration instanceof CompositeRuleConfiguration) {

+			return processCompositeRule((CompositeRuleConfiguration) RuleConfiguration, eObject);

+		} else if (RuleConfiguration instanceof NotRuleConfiguration) {

+			RuleConfiguration composedRule = ((NotRuleConfiguration) RuleConfiguration).getComposedRule();

+			return !processRule(composedRule, eObject);

+		} else {

+			return RuleConfigurationTypeRegistry.getInstance().getRule(RuleConfiguration).matches(eObject);

+		}

+	}

+

+	/**

+	 * @param compositeRule

+	 * @param eObject

+	 * @return

+	 */

+	protected boolean processCompositeRule(CompositeRuleConfiguration compositeRule, EObject eObject) {

+		Iterator<RuleConfiguration> iterator = compositeRule.getComposedRules().iterator();

+		RuleConfiguration nextComposedRuleConfiguration = iterator.next();

+		boolean result = processRule(nextComposedRuleConfiguration, eObject);

+

+		while (iterator.hasNext()) {

+			nextComposedRuleConfiguration = iterator.next();

+

+			boolean resultNextComposedRuleConfiguration = processRule(nextComposedRuleConfiguration, eObject);

+

+			if (compositeRule instanceof OrRuleConfiguration) {

+				if (result == false && resultNextComposedRuleConfiguration) {

+					result = true;

+				}

+			} else if (compositeRule instanceof AndRuleConfiguration) {

+				if (result == true && !resultNextComposedRuleConfiguration) {

+					result = false;

+				}

+			}

+		}

+

+		return result;

+	}

+

+

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRule.java
index 332cb6abf05..44c2e71814d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRule.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRule.java
@@ -10,13 +10,13 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;

+package org.eclipse.papyrus.infra.types.rulebased.core;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

 

-public interface IInvariantRule<T extends InvariantRuleConfiguration> {

+public interface IRule<T extends RuleConfiguration> {

 	public void init(T invariantRuleConfiguration);

 

 	public boolean approveRequest(IEditCommandRequest request);

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRuleExtensionPoint.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRuleExtensionPoint.java
index 97a8c7126f8..a58fd13a030 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/IInvariantRuleExtensionPoint.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/IRuleExtensionPoint.java
@@ -10,19 +10,19 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+package org.eclipse.papyrus.infra.types.rulebased.core;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.Activator;
+import org.eclipse.papyrus.infra.types.rulebased.Activator;
 
 
 
 
-public interface IInvariantRuleExtensionPoint {
+public interface IRuleExtensionPoint {
 
 	/** ID of the extension point */
-	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".invariantRule";
+	public final static String EXTENSION_POINT_ID = Activator.PLUGIN_ID + ".ruleKind";
 
 	public static final String CONFIGURATION_CLASS = "configurationClass";
 
-	public static final String INVARIANT_RULE_CLASS = "invariantRuleClass";
+	public static final String INVARIANT_RULE_CLASS = "ruleClass";
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/RuleConfigurationTypeRegistry.java
index 34a335ff5c3..e519b85fb28 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantRuleConfigurationTypeRegistry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/RuleConfigurationTypeRegistry.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+package org.eclipse.papyrus.infra.types.rulebased.core;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,25 +18,25 @@ import java.util.Map;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.Activator;
+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;
 
-public class InvariantRuleConfigurationTypeRegistry {
+public class RuleConfigurationTypeRegistry {
 
 	/** private singleton instance */
-	private static InvariantRuleConfigurationTypeRegistry registry;
+	private static RuleConfigurationTypeRegistry registry;
 
 	/** map configuration type to invariantRule */
-	protected Map<String, IInvariantRule<? extends InvariantRuleConfiguration>> invariantRuleConfigurationTypeToInvariantRule = null;
+	protected Map<String, IRule<? extends RuleConfiguration>> invariantRuleConfigurationTypeToInvariantRule = null;
 
 	/**
 	 * returns the singleton instance of this registry
 	 *
 	 * @return the singleton instance of this registry
 	 */
-	public static synchronized InvariantRuleConfigurationTypeRegistry getInstance() {
+	public static synchronized RuleConfigurationTypeRegistry getInstance() {
 		if (registry == null) {
-			registry = new InvariantRuleConfigurationTypeRegistry();
+			registry = new RuleConfigurationTypeRegistry();
 			registry.init();
 		}
 		return registry;
@@ -46,15 +46,15 @@ public class InvariantRuleConfigurationTypeRegistry {
 	 * Inits the registry.
 	 */
 	protected void init() {
-		invariantRuleConfigurationTypeToInvariantRule = new HashMap<String, IInvariantRule<? extends InvariantRuleConfiguration>>();
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IInvariantRuleExtensionPoint.EXTENSION_POINT_ID);
+		invariantRuleConfigurationTypeToInvariantRule = new HashMap<String, IRule<? extends RuleConfiguration>>();
+		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(IRuleExtensionPoint.EXTENSION_POINT_ID);
 		for (IConfigurationElement configurationElement : elements) {
-			String configurationClass = configurationElement.getAttribute(IInvariantRuleExtensionPoint.CONFIGURATION_CLASS);
+			String configurationClass = configurationElement.getAttribute(IRuleExtensionPoint.CONFIGURATION_CLASS);
 
 			try {
-				Object invariantRuleClass = configurationElement.createExecutableExtension(IInvariantRuleExtensionPoint.INVARIANT_RULE_CLASS);
-				if (invariantRuleClass instanceof IInvariantRule) {
-					invariantRuleConfigurationTypeToInvariantRule.put(configurationClass, (IInvariantRule<?>) invariantRuleClass);
+				Object invariantRuleClass = configurationElement.createExecutableExtension(IRuleExtensionPoint.INVARIANT_RULE_CLASS);
+				if (invariantRuleClass instanceof IRule) {
+					invariantRuleConfigurationTypeToInvariantRule.put(configurationClass, (IRule<?>) invariantRuleClass);
 				}
 			} catch (CoreException e) {
 				Activator.log.error(e);
@@ -62,16 +62,16 @@ public class InvariantRuleConfigurationTypeRegistry {
 		}
 	}
 
-	public <T extends InvariantRuleConfiguration> IInvariantRule<? extends InvariantRuleConfiguration> getInvariantRule(T invariantRuleConfiguration) {
+	public <T extends RuleConfiguration> IRule<? extends RuleConfiguration> getRule(T invariantRuleConfiguration) {
 		String invariantRuleConfigurationType = invariantRuleConfiguration.eClass().getInstanceTypeName();
 		// We assume here that the right invariantType is registered for the right InvariantRuleConfiguration
 		@SuppressWarnings("unchecked")
-		IInvariantRule<T> invariantRule = (IInvariantRule<T>) invariantRuleConfigurationTypeToInvariantRule.get(invariantRuleConfigurationType);
+		IRule<T> invariantRule = (IRule<T>) invariantRuleConfigurationTypeToInvariantRule.get(invariantRuleConfigurationType);
 		if (invariantRule != null) {
 			invariantRule.init(invariantRuleConfiguration);
 			return invariantRule;
 		} else {
-			return new DefaultInvariantRule();
+			return new DefaultRule();
 		}
 	}
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/RuleElementTypeFactory.java
index 5be9767d285..51fa664ee5e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/src/org/eclipse/papyrus/infra/elementtypesconfigurations/invarianttypes/invarianttypeconfiguration/InvariantElementTypeFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.rulebased/src/org/eclipse/papyrus/infra/types/rulebased/core/RuleElementTypeFactory.java
@@ -10,19 +10,19 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration;
+package org.eclipse.papyrus.infra.types.rulebased.core;
 
 import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.SpecializationTypeFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.factories.impl.SpecializationTypeFactory;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
 
-public class InvariantElementTypeFactory extends SpecializationTypeFactory {
+public class RuleElementTypeFactory extends SpecializationTypeFactory {
 
 	@Override
 	protected IElementMatcher createElementMatcher(SpecializationTypeConfiguration configuration) {
-		if (configuration instanceof InvariantTypeConfiguration) {
-			return new DefaultInvariantElementMatcher((InvariantTypeConfiguration) configuration);
+		if (configuration instanceof RuleBasedTypeConfiguration) {
+			return new DefaultRuleElementMatcher((RuleBasedTypeConfiguration) configuration);
 		}
 		return null;
 	}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.classpath
index b277a8ac870..b277a8ac870 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.classpath
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.project
index 22eaa266dec..96400fd6e2c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.project
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.ui</name>
+	<name>org.eclipse.papyrus.infra.types.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF
index 39f9853294d..f02c36cc9fa 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui;bundle-version="3.100.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;x-internal:=true,
- org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",

+ org.eclipse.ui;bundle-version="3.100.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport

+Export-Package: org.eclipse.papyrus.infra.types.core.internal.ui;x-internal:=true,

+ org.eclipse.papyrus.infra.types.core.internal.ui.handlers;x-internal:=true

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/build.properties
index 96f31b73bf1..96f31b73bf1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/build.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/build.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/icons/configuration.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/icons/configuration.gif
index 0b1be97b8cf..0b1be97b8cf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/icons/configuration.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/icons/configuration.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/icons/error.gif b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/icons/error.gif
index 9b048d60532..9b048d60532 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/icons/error.gif
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/icons/error.gif
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties
index 25f1ec0ac97..25f1ec0ac97 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/plugin.properties
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
index 489d2c6f44e..1db7acb4dd0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
@@ -20,7 +20,7 @@
           allPopups="false"
           locationURI="popup:org.eclipse.ui.popup.any?after=additions">
        <command
-             commandId="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.deploy"
+             commandId="org.eclipse.papyrus.infra.types.ui.deploy"
              icon="icons/configuration.gif"
              style="push">
           <visibleWhen
@@ -44,7 +44,7 @@
           </visibleWhen>
        </command>
        <command
-             commandId="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.undeploy"
+             commandId="org.eclipse.papyrus.infra.types.ui.undeploy"
              icon="icons/configuration.gif"
              style="push">
           <visibleWhen
@@ -73,13 +73,13 @@
 	<extension
          point="org.eclipse.ui.commands">
 		<command
-            defaultHandler="org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers.DeployElementTypeSetConfigurationHandler"
-            id="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.deploy"
+            defaultHandler="org.eclipse.papyrus.infra.types.core.internal.ui.handlers.DeployElementTypeSetConfigurationHandler"
+            id="org.eclipse.papyrus.infra.types.ui.deploy"
             name="Deploy ElementTypes Set configuration">
 		</command>
 		<command
-            defaultHandler="org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers.UndeployElementTypeSetConfigurationHandler"
-            id="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.undeploy"
+            defaultHandler="org.eclipse.papyrus.infra.types.core.internal.ui.handlers.UndeployElementTypeSetConfigurationHandler"
+            id="org.eclipse.papyrus.infra.types.ui.undeploy"
             name="Disable ElementTypes Set configuration">
 		</command>
 	</extension>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml
new file mode 100644
index 00000000000..6bc9f5afdd9
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-types</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.types.ui</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/LogUtil.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/LogUtil.java
index 7c24fcc4a4f..e7fbfe9be21 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/LogUtil.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/LogUtil.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui;
+package org.eclipse.papyrus.infra.types.core.internal.ui;
 
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.papyrus.infra.core.log.LogHelper;
@@ -27,7 +27,7 @@ public class LogUtil extends LogHelper {
 	 * Not instantiable by clients.
 	 */
 	private LogUtil() {
-		super(Platform.getBundle("org.eclipse.papyrus.infra.elementtypesconfigurations.ui")); //$NON-NLS-1$
+		super(Platform.getBundle("org.eclipse.papyrus.infra.types.ui")); //$NON-NLS-1$
 	}
 
 }
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
index af47bcf7fa9..cc9894ce750 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/DeployElementTypeSetConfigurationHandler.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;

+package org.eclipse.papyrus.infra.types.core.internal.ui.handlers;

 

 import java.util.Iterator;

 

@@ -33,9 +33,9 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.providers.ClientContextContentProvider;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.papyrus.infra.types.core.Activator;

+import org.eclipse.papyrus.infra.types.core.internal.ui.providers.ClientContextContentProvider;

+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ListSelectionDialog;

 import org.eclipse.ui.handlers.HandlerUtil;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
index 0fa15eff03c..b2c6358b0ca 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/handlers/UndeployElementTypeSetConfigurationHandler.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.handlers;

+package org.eclipse.papyrus.infra.types.core.internal.ui.handlers;

 

 import java.util.Iterator;

 

@@ -37,10 +37,10 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.providers.ClientContextContentProvider;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

+import org.eclipse.papyrus.infra.types.core.Activator;

+import org.eclipse.papyrus.infra.types.core.internal.ui.providers.ClientContextContentProvider;

+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.ui.dialogs.ListSelectionDialog;

 import org.eclipse.ui.handlers.HandlerUtil;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/providers/ClientContextContentProvider.java b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/providers/ClientContextContentProvider.java
index 292ba0a6588..3c6273d52e8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.ui/src/org/eclipse/papyrus/infra/elementtypesconfigurations/internal/ui/providers/ClientContextContentProvider.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/src/org/eclipse/papyrus/infra/types/core/internal/ui/providers/ClientContextContentProvider.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.infra.elementtypesconfigurations.internal.ui.providers;

+package org.eclipse.papyrus.infra.types.core.internal.ui.providers;

 

 import java.util.ArrayList;

 import java.util.Collection;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.classpath b/plugins/infra/types/org.eclipse.papyrus.infra.types/.classpath
index 50aae142c50..8dd013afc8b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/.classpath
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.project b/plugins/infra/types/org.eclipse.papyrus.infra.types/.project
index 22e16c202cd..5f09a69ab49 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.project
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.tests</name>
+	<name>org.eclipse.papyrus.infra.types</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.core.resources.prefs b/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..8f50c3bae44
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//model/ElementElementTypesConfigurations.ecore=UTF-8
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..4e885cb3f8a
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.types;singleton:=true
+Bundle-Version: 1.2.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.infra.types,
+ org.eclipse.papyrus.infra.types.impl,
+ org.eclipse.papyrus.infra.types.resource,
+ org.eclipse.papyrus.infra.types.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/about.html b/plugins/infra/types/org.eclipse.papyrus.infra.types/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/about.html
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/about.html
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties
new file mode 100644
index 00000000000..254f8b3e4c0
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/build.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/,\
+               src-gen/
+output.. = bin/
+
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
index a436cfb25f6..828a45c9596 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="elementtypesconfigurations" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-    nsPrefix="elementtypesconfigurations">
-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeSetConfiguration" eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"
-        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="adviceBindingsConfigurations"
-        upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="metamodelNsURI" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"
-      eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AdviceConfiguration" abstract="true"
-      eSuperTypes="#//ConfigurationElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"
-      abstract="true" eSuperTypes="#//AdviceConfiguration #//IdentifiedConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//ElementTypeConfiguration"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
-        eType="#//ContainerConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" lowerBound="1"
-        eType="#//InheritanceKind"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"
-        eType="#//AbstractEditHelperAdviceConfiguration" containment="true" eOpposite="#//AbstractEditHelperAdviceConfiguration/target"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"
-        eType="#//ContainerConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containerMatcherConfiguration"
-        eType="#//AbstractMatcherConfiguration" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eContainmentFeatures" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetamodelTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractEditHelperAdviceConfiguration"
-      abstract="true" eSuperTypes="#//AdviceConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">
-    <eLiterals name="none"/>
-    <eLiterals name="all" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EditHelperAdviceConfiguration" eSuperTypes="#//AbstractEditHelperAdviceConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AdviceBindingConfiguration" eSuperTypes="#//AbstractAdviceBindingConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" eSuperTypes="#//AbstractMatcherConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matcherClassName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IdentifiedConfiguration" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NamedConfiguration" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="types" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

+    nsPrefix="elementtypesconfigurations">

+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeSetConfiguration" eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="elementTypeConfigurations"

+        upperBound="-1" eType="#//ElementTypeConfiguration" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="adviceBindingsConfigurations"

+        upperBound="-1" eType="#//AbstractAdviceBindingConfiguration" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="metamodelNsURI" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ElementTypeConfiguration" abstract="true"

+      eSuperTypes="#//ConfigurationElement #//IdentifiedConfiguration #//NamedConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"

+        defaultValueLiteral="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="iconEntry" eType="#//IconEntry"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IconEntry">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconPath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ConfigurationElement" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractMatcherConfiguration" abstract="true"/>

+  <eClassifiers xsi:type="ecore:EClass" name="AdviceConfiguration" abstract="true"

+      eSuperTypes="#//ConfigurationElement">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractAdviceBindingConfiguration"

+      abstract="true" eSuperTypes="#//AdviceConfiguration #//IdentifiedConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

+        eType="#//ElementTypeConfiguration"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"

+        eType="#//ContainerConfiguration" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" lowerBound="1"

+        eType="#//InheritanceKind"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="SpecializationTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="specializedTypesID" lowerBound="1"

+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="editHelperAdviceConfiguration"

+        eType="#//AbstractEditHelperAdviceConfiguration" containment="true" eOpposite="#//AbstractEditHelperAdviceConfiguration/target"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerConfiguration"

+        eType="#//ContainerConfiguration" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="matcherConfiguration" eType="#//AbstractMatcherConfiguration"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ContainerConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containerMatcherConfiguration"

+        eType="#//AbstractMatcherConfiguration" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="eContainmentFeatures" upperBound="-1"

+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MetamodelTypeConfiguration" eSuperTypes="#//ElementTypeConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="eClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractEditHelperAdviceConfiguration"

+      abstract="true" eSuperTypes="#//AdviceConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

+        eType="#//SpecializationTypeConfiguration" eOpposite="#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">

+    <eLiterals name="none"/>

+    <eLiterals name="all" value="1"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EditHelperAdviceConfiguration" eSuperTypes="#//AbstractEditHelperAdviceConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"

+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AdviceBindingConfiguration" eSuperTypes="#//AbstractAdviceBindingConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editHelperAdviceClassName"

+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MatcherConfiguration" eSuperTypes="#//AbstractMatcherConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matcherClassName" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IdentifiedConfiguration" abstract="true"

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="NamedConfiguration" abstract="true"

+      interface="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore_diagram b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram
index dc08b8fc59d..c1344ecba16 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore_diagram
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore_diagram
@@ -1,555 +1,555 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_abOYABQPEeSwyuAkiSG7MA" type="Ecore" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_dZR9MBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZR9MhQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9MxQSEeSwyuAkiSG7MA" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_LxebkBu-EeSI_rJGQSJeSQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_LxebkRu-EeSI_rJGQSJeSQ"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NBQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9NRQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9NhQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NxQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9OBQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkQBQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkQRQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkQhQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZR9MRQSEeSwyuAkiSG7MA" x="510" y="335"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_dZSkQxQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZSkRRQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkRhQSEeSwyuAkiSG7MA" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_ok1poMpoEeWPW4wup-qMUw" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok1pocpoEeWPW4wup-qMUw"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_ok7wQMpoEeWPW4wup-qMUw" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok7wQcpoEeWPW4wup-qMUw"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkRxQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSBQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkSRQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkShQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSxQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkTBQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkTRQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkThQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZSkRBQSEeSwyuAkiSG7MA" x="315" y="610"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_dZTLUBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZTLUhQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLUxQSEeSwyuAkiSG7MA" type="7001">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVBQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLVRQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLVhQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVxQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWBQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLWRQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLWhQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWxQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IconEntry"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTLURQSEeSwyuAkiSG7MA" x="40" y="590"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_dZTyYBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZTyYhQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyYxQSEeSwyuAkiSG7MA" type="7001">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZBQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyZRQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyZhQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZxQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaBQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyaRQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyahQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaxQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ConfigurationElement"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTyYRQSEeSwyuAkiSG7MA" x="390" y="55"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_dZTybBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZcBQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZcRQSEeSwyuAkiSG7MA" type="7001">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZchQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZcxQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdBQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZdRQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZdhQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdxQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZeBQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZeRQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTybRQSEeSwyuAkiSG7MA" x="990" y="870"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_dZUZehQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZfBQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZfRQSEeSwyuAkiSG7MA" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_lcjhoBY3EeSSL_L7W7Ic3A" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcjhoRY3EeSSL_L7W7Ic3A"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_TCKh8BQeEeSwyuAkiSG7MA" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_TCKh8RQeEeSwyuAkiSG7MA"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZfhQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZfxQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZgBQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgBQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAgRQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVAghQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgxQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAhBQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZUZexQSEeSwyuAkiSG7MA" x="910" y="175"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_dZVnkBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_dZVnkhQSEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnkxQSEeSwyuAkiSG7MA" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_z6xdkBfKEeShg7yWMgp7yA" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_z6xdkRfKEeShg7yWMgp7yA"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlBQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnlRQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnlhQSEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlxQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmBQSEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnmRQSEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnmhQSEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmxQSEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZVnkRQSEeSwyuAkiSG7MA" x="890" y="620"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_r_7yoBQUEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_r_8ZsBQUEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZsRQUEeSwyuAkiSG7MA" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_dZgmsBQSEeSwyuAkiSG7MA" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_dZgmsRQSEeSwyuAkiSG7MA"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_r_8ZshQUEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_8ZsxQUEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZtBQUEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwBQUEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AwRQUEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_r_9AwhQUEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwxQUEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AxBQUEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r_7yoRQUEeSwyuAkiSG7MA" x="420" y="1110"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_Rt13gBQXEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_Rt2ekBQXEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt2ekRQXEeSwyuAkiSG7MA" type="7001">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt2ekhQXEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt2ekxQXEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoBQXEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FoRQXEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FohQXEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoxQXEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FpBQXEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FpRQXEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//ContainerConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rt13gRQXEeSwyuAkiSG7MA" x="555" y="870"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_-uCeQBQZEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_-uDFUBQZEeSwyuAkiSG7MA" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDFURQZEeSwyuAkiSG7MA" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_rBv9ABQdEeSwyuAkiSG7MA" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_rBv9ARQdEeSwyuAkiSG7MA"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDFUhQZEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDFUxQZEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYBQZEeSwyuAkiSG7MA" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsYRQZEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsYhQZEeSwyuAkiSG7MA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYxQZEeSwyuAkiSG7MA" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsZBQZEeSwyuAkiSG7MA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsZRQZEeSwyuAkiSG7MA"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MetamodelTypeConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCeQRQZEeSwyuAkiSG7MA" x="105" y="1115"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_18yYoBfKEeShg7yWMgp7yA" type="2005" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_18yYohfKEeShg7yWMgp7yA" type="5005"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYoxfKEeShg7yWMgp7yA" type="7011">
-      <children xmi:type="notation:Node" xmi:id="_6FTtMBfKEeShg7yWMgp7yA" type="3009">
-        <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/all"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6FTtMRfKEeShg7yWMgp7yA"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_7Ybh8BfKEeShg7yWMgp7yA" type="3009">
-        <element xmi:type="ecore:EEnumLiteral" href="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7Ybh8RfKEeShg7yWMgp7yA"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpBfKEeShg7yWMgp7yA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYpRfKEeShg7yWMgp7yA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYphfKEeShg7yWMgp7yA" type="7012">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpxfKEeShg7yWMgp7yA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYqBfKEeShg7yWMgp7yA"/>
-    </children>
-    <element xmi:type="ecore:EEnum" href="ElementTypesConfigurations.ecore#//InheritanceKind"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18yYoRfKEeShg7yWMgp7yA" x="1120" y="620"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_KdlD4BgSEeSAXuG_wvLrDw" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_KdlD4hgSEeSAXuG_wvLrDw" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD4xgSEeSAXuG_wvLrDw" type="7001">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5BgSEeSAXuG_wvLrDw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD5RgSEeSAXuG_wvLrDw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD5hgSEeSAXuG_wvLrDw" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5xgSEeSAXuG_wvLrDw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD6BgSEeSAXuG_wvLrDw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Kdlq8BgSEeSAXuG_wvLrDw" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Kdlq8RgSEeSAXuG_wvLrDw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kdlq8hgSEeSAXuG_wvLrDw"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdlD4RgSEeSAXuG_wvLrDw" x="1375" y="650"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_1pGfMMi9EeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_1pHtUMi9EeWPvPHRj0_oqw" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtUci9EeWPvPHRj0_oqw" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_kjFZcMi9EeWPvPHRj0_oqw" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_kjFZcci9EeWPvPHRj0_oqw"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtUsi9EeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtU8i9EeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtVMi9EeWPvPHRj0_oqw" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtVci9EeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtVsi9EeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtV8i9EeWPvPHRj0_oqw" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtWMi9EeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtWci9EeWPvPHRj0_oqw"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pGfMci9EeWPvPHRj0_oqw" x="1240" y="810"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_vzQJUMjBEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_vzQwYMjBEeWPvPHRj0_oqw" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwYcjBEeWPvPHRj0_oqw" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_-VKBoMjDEeWPvPHRj0_oqw" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-VKBocjDEeWPvPHRj0_oqw"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwYsjBEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwY8jBEeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZMjBEeWPvPHRj0_oqw" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwZcjBEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwZsjBEeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZ8jBEeWPvPHRj0_oqw" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwaMjBEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwacjBEeWPvPHRj0_oqw"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzQJUcjBEeWPvPHRj0_oqw" x="515" y="720"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_PI9n8MjCEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_PI-PAMjCEeWPvPHRj0_oqw" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PAcjCEeWPvPHRj0_oqw" type="7001">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PAsjCEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PA8jCEeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PBMjCEeWPvPHRj0_oqw" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PBcjCEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PBsjCEeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PB8jCEeWPvPHRj0_oqw" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PCMjCEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PCcjCEeWPvPHRj0_oqw"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//MatcherConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PI9n8cjCEeWPvPHRj0_oqw" x="1120" y="1050"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_WLo7QMmYEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_WLo7QsmYEeWPvPHRj0_oqw" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7Q8mYEeWPvPHRj0_oqw" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_SdpmlMmYEeWPvPHRj0_oqw" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmlcmYEeWPvPHRj0_oqw"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7RMmYEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7RcmYEeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7RsmYEeWPvPHRj0_oqw" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7R8mYEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7SMmYEeWPvPHRj0_oqw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7ScmYEeWPvPHRj0_oqw" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7SsmYEeWPvPHRj0_oqw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7S8mYEeWPvPHRj0_oqw"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//IdentifiedConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WLo7QcmYEeWPvPHRj0_oqw" x="680" y="535"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_jQEu8MppEeWPW4wup-qMUw" type="2001" fontName="Segoe UI">
-    <children xmi:type="notation:DecorationNode" xmi:id="_jQF9EMppEeWPW4wup-qMUw" type="5001"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkIMppEeWPW4wup-qMUw" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_SdpmkMmYEeWPvPHRj0_oqw" type="3001">
-        <element xmi:type="ecore:EAttribute" href="ElementTypesConfigurations.ecore#//NamedConfiguration/name"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmkcmYEeWPvPHRj0_oqw"/>
-      </children>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkIcppEeWPW4wup-qMUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkIsppEeWPW4wup-qMUw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkI8ppEeWPW4wup-qMUw" type="7002">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJMppEeWPW4wup-qMUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkJcppEeWPW4wup-qMUw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkJsppEeWPW4wup-qMUw" type="7003">
-      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJ8ppEeWPW4wup-qMUw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkKMppEeWPW4wup-qMUw"/>
-    </children>
-    <element xmi:type="ecore:EClass" href="ElementTypesConfigurations.ecore#//NamedConfiguration"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQEu8cppEeWPW4wup-qMUw" x="385" y="205"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_abOYARQPEeSwyuAkiSG7MA"/>
-  <element xmi:type="ecore:EPackage" href="ElementTypesConfigurations.ecore#/"/>
-  <edges xmi:type="notation:Connector" xmi:id="_daPmgBQSEeSwyuAkiSG7MA" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_daPmgxQSEeSwyuAkiSG7MA" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhBQSEeSwyuAkiSG7MA" x="-9" y="-72"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_daPmhRQSEeSwyuAkiSG7MA" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhhQSEeSwyuAkiSG7MA" x="-5" y="-15"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_daPmgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daPmghQSEeSwyuAkiSG7MA" points="[0, 0, 234, -337]$[-204, 293, 30, -44]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXUxQSEeSwyuAkiSG7MA" id="(0.3333333333333333,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXVBQSEeSwyuAkiSG7MA" id="(0.8641975308641975,0.14666666666666667)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_daTQ4BQSEeSwyuAkiSG7MA" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_daTQ4RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daTQ4hQSEeSwyuAkiSG7MA" points="[6, -29, 148, 280]$[6, -189, 148, 120]$[-142, -189, 0, 120]$[-142, -250, 0, 59]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbI-YBQSEeSwyuAkiSG7MA" id="(0.48905109489051096,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_daYJYBQSEeSwyuAkiSG7MA" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_daYJYRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daYJYhQSEeSwyuAkiSG7MA" points="[0, -6, -78, 555]$[0, -441, -78, 120]$[78, -441, 0, 120]$[78, -502, 0, 59]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ERQSEeSwyuAkiSG7MA" id="(0.11728395061728394,0.08)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7EhQSEeSwyuAkiSG7MA" id="(0.16058394160583941,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_daZXgBQSEeSwyuAkiSG7MA" type="4003" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTLUBQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-kBQSEeSwyuAkiSG7MA" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kRQSEeSwyuAkiSG7MA" x="4" y="-12"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-khQSEeSwyuAkiSG7MA" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kxQSEeSwyuAkiSG7MA" x="8" y="-23"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_daZXgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daZXghQSEeSwyuAkiSG7MA" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQhQSEeSwyuAkiSG7MA" id="(0.9135802469135802,0.14666666666666667)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQxQSEeSwyuAkiSG7MA" id="(0.032520325203252036,0.5333333333333333)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_daca0BQSEeSwyuAkiSG7MA" type="4004" source="_dZUZehQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_daca0RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daca0hQSEeSwyuAkiSG7MA" points="[0, -4, 422, 82]$[0, -39, 422, 47]$[-422, -39, 0, 47]$[-422, -65, 0, 21]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ExQSEeSwyuAkiSG7MA" id="(0.2868217054263566,0.054945054945054944)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7FBQSEeSwyuAkiSG7MA" id="(0.9854014598540146,0.6483516483516484)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_dagFMBQSEeSwyuAkiSG7MA" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZUZehQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_dagFMRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dagFMhQSEeSwyuAkiSG7MA" points="[-2, -52, 22, 626]$[-22, -619, 2, 59]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNBQSEeSwyuAkiSG7MA" id="(0.4971751412429379,1.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNRQSEeSwyuAkiSG7MA" id="(0.5,0.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_s3NjcBQVEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjcxQVEeSwyuAkiSG7MA" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdBQVEeSwyuAkiSG7MA" x="-8" y="-64"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjdRQVEeSwyuAkiSG7MA" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdhQVEeSwyuAkiSG7MA" x="-29" y="11"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_s3NjcRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3NjchQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BhqqsBfDEeShg7yWMgp7yA" id="(0.8705882352941177,0.8461538461538461)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_s3PYoBQVEeSwyuAkiSG7MA" type="4004" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_s3PYoRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3PYohQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_hDfWYBQYEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9cBQYEeSwyuAkiSG7MA" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cRQYEeSwyuAkiSG7MA" x="5" y="-39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9chQYEeSwyuAkiSG7MA" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cxQYEeSwyuAkiSG7MA" x="-35" y="13"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hDfWYRQYEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hDfWYhQYEeSwyuAkiSG7MA" points="[-2, 4, 29, -100]$[-23, 75, 8, -29]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hDjn0BQYEeSwyuAkiSG7MA" id="(0.9529411764705882,0.6346153846153846)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_IGuE4BQaEeSwyuAkiSG7MA" type="4004" source="_-uCeQBQZEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_IGuE4RQaEeSwyuAkiSG7MA" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IGuE4hQaEeSwyuAkiSG7MA" points="[-2, -5, 97, 310]$[-94, -299, 5, 16]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcBQaEeSwyuAkiSG7MA" id="(0.5327102803738317,0.09615384615384616)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcRQaEeSwyuAkiSG7MA" id="(0.2716049382716049,0.9866666666666667)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_KdoHMBgSEeSAXuG_wvLrDw" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_KdlD4BgSEeSAXuG_wvLrDw">
-    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHMxgSEeSAXuG_wvLrDw" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNBgSEeSAXuG_wvLrDw" x="138" y="13"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHNRgSEeSAXuG_wvLrDw" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNhgSEeSAXuG_wvLrDw" x="162" y="23"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KdoHMRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KdoHMhgSEeSAXuG_wvLrDw" points="[96, 0, -878, 463]$[974, 0, 0, 463]$[974, -437, 0, 26]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_Kdp8YBgSEeSAXuG_wvLrDw" type="4004" source="_KdlD4BgSEeSAXuG_wvLrDw" target="_dZUZehQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_Kdp8YRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kdp8YhgSEeSAXuG_wvLrDw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_KGvBIBv3EeSyLpQry5wnWQ" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZVnkBQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQBv3EeSyLpQry5wnWQ" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQRv3EeSyLpQry5wnWQ" x="18" y="-79"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQhv3EeSyLpQry5wnWQ" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQxv3EeSyLpQry5wnWQ" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KGvBIRv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KGvBIhv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_KG2V4Bv3EeSyLpQry5wnWQ" type="4002" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V4xv3EeSyLpQry5wnWQ" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5Bv3EeSyLpQry5wnWQ" x="37" y="-10"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V5Rv3EeSyLpQry5wnWQ" type="6003">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5hv3EeSyLpQry5wnWQ" x="40" y="-10"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_KG2V4Rv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KG2V4hv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_QwLaUBv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYBv3EeSyLpQry5wnWQ" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYRv3EeSyLpQry5wnWQ" x="29" y="68"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYhv3EeSyLpQry5wnWQ" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYxv3EeSyLpQry5wnWQ" x="7" y="-14"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_QwLaURv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwLaUhv3EeSyLpQry5wnWQ" points="[25, -29, -127, 149]$[151, -152, -1, 26]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_TqIqABv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREBv3EeSyLpQry5wnWQ" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRERv3EeSyLpQry5wnWQ" x="87" y="38"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREhv3EeSyLpQry5wnWQ" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRExv3EeSyLpQry5wnWQ" x="49" y="13"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_TqIqARv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqIqAhv3EeSyLpQry5wnWQ" points="[7, -3, -434, 140]$[405, -129, -36, 14]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Bv3EeSyLpQry5wnWQ" id="(0.9633507853403142,0.22033898305084745)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Rv3EeSyLpQry5wnWQ" id="(0.27932960893854747,0.7627118644067796)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_jEdp4Mi-EeWPvPHRj0_oqw" type="4004" source="_1pGfMMi9EeWPvPHRj0_oqw" target="_KdlD4BgSEeSAXuG_wvLrDw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_jEdp4ci-EeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jEdp4si-EeWPvPHRj0_oqw" points="[30, -29, -124, 89]$[96, -144, -58, -26]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_9jrzUMjBEeWPvPHRj0_oqw" type="4004" source="_vzQJUMjBEeWPvPHRj0_oqw" target="_dZVnkBQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_9jsaYMjBEeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9jsaYcjBEeWPvPHRj0_oqw" points="[32, -26, -107, 101]$[246, -134, 107, -7]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_SmnakMjCEeWPvPHRj0_oqw" type="4004" source="_PI9n8MjCEeWPvPHRj0_oqw" target="_dZTybBQSEeSwyuAkiSG7MA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_SmnakcjCEeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SmnaksjCEeWPvPHRj0_oqw" points="[-23, -26, 80, 86]$[-105, -141, -2, -29]"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_46pKoMjMEeWPvPHRj0_oqw" type="4003" source="_Rt13gBQXEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">
-    <children xmi:type="notation:DecorationNode" xmi:id="_46pxsMjMEeWPvPHRj0_oqw" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxscjMEeWPvPHRj0_oqw" x="-11" y="16"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_46pxssjMEeWPvPHRj0_oqw" type="6004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxs8jMEeWPvPHRj0_oqw" x="-3" y="-14"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_46pKocjMEeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xmi:type="ecore:EReference" href="ElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_46pKosjMEeWPvPHRj0_oqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Vx5MMjMEeWPvPHRj0_oqw" id="(0.9241379310344827,0.5576923076923077)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_ZTrDMMmYEeWPvPHRj0_oqw" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_ZTrDMcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZTrDMsmYEeWPvPHRj0_oqw" points="[-4, -3, 120, 89]$[-52, -89, 72, 3]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZTtfcMmYEeWPvPHRj0_oqw" id="(0.14018691588785046,0.05084745762711865)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_ZuldkMmYEeWPvPHRj0_oqw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_ZumEoMmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZumEocmYEeWPvPHRj0_oqw" points="[24, -15, -151, 84]$[104, -91, -71, 8]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZunSwMmYEeWPvPHRj0_oqw" id="(0.7777777777777778,0.2)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_aUOhQMmYEeWPvPHRj0_oqw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_aUOhQcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aUOhQsmYEeWPvPHRj0_oqw" points="[-1, 30, 0, -188]$[-26, 206, -25, -12]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aUQWcMmYEeWPvPHRj0_oqw" id="(0.3006993006993007,0.23076923076923078)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_nnnW8MppEeWPW4wup-qMUw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_nnnW8cppEeWPW4wup-qMUw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nnnW8sppEeWPW4wup-qMUw" points="[11, -8, -135, 96]$[147, -74, 1, 30]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nnrBUMppEeWPW4wup-qMUw" id="(0.8333333333333334,0.10666666666666667)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2GZ7wMppEeWPW4wup-qMUw" id="(0.4621212121212121,0.8813559322033898)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_oA4LgMppEeWPW4wup-qMUw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_oA4LgcppEeWPW4wup-qMUw" fontName="Segoe UI"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oA4LgsppEeWPW4wup-qMUw" points="[0, -29, 116, 77]$[0, -59, 116, 47]$[-116, -59, 0, 47]$[-116, -100, 0, 6]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_85h1YMppEeWPW4wup-qMUw" id="(0.7424242424242424,0.8983050847457628)"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_abOYABQPEeSwyuAkiSG7MA" type="Ecore" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_dZR9MBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZR9MhQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9MxQSEeSwyuAkiSG7MA" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_LxebkBu-EeSI_rJGQSJeSQ" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/metamodelNsURI"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LxebkRu-EeSI_rJGQSJeSQ"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NBQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9NRQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZR9NhQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZR9NxQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZR9OBQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkQBQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkQRQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkQhQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZR9MRQSEeSwyuAkiSG7MA" x="510" y="335"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_dZSkQxQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZSkRRQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkRhQSEeSwyuAkiSG7MA" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_ok1poMpoEeWPW4wup-qMUw" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration/hint"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok1pocpoEeWPW4wup-qMUw"/>

+      </children>

+      <children xmi:type="notation:Node" xmi:id="_ok7wQMpoEeWPW4wup-qMUw" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration/kind"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ok7wQcpoEeWPW4wup-qMUw"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkRxQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSBQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkSRQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkShQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkSxQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZSkTBQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZSkTRQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZSkThQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZSkRBQSEeSwyuAkiSG7MA" x="315" y="610"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_dZTLUBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZTLUhQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLUxQSEeSwyuAkiSG7MA" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVBQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLVRQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLVhQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLVxQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWBQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTLWRQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTLWhQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTLWxQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//IconEntry"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTLURQSEeSwyuAkiSG7MA" x="40" y="590"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_dZTyYBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZTyYhQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyYxQSEeSwyuAkiSG7MA" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZBQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyZRQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyZhQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyZxQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaBQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZTyaRQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZTyahQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZTyaxQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ConfigurationElement"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTyYRQSEeSwyuAkiSG7MA" x="390" y="55"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_dZTybBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZcBQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZcRQSEeSwyuAkiSG7MA" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZchQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZcxQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdBQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZdRQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZdhQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZdxQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZeBQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZeRQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AbstractMatcherConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZTybRQSEeSwyuAkiSG7MA" x="990" y="870"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_dZUZehQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZUZfBQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZfRQSEeSwyuAkiSG7MA" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_lcjhoBY3EeSSL_L7W7Ic3A" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//AdviceConfiguration/before"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lcjhoRY3EeSSL_L7W7Ic3A"/>

+      </children>

+      <children xmi:type="notation:Node" xmi:id="_TCKh8BQeEeSwyuAkiSG7MA" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//AdviceConfiguration/after"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TCKh8RQeEeSwyuAkiSG7MA"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZUZfhQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZUZfxQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZUZgBQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgBQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAgRQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVAghQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVAgxQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVAhBQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AdviceConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZUZexQSEeSwyuAkiSG7MA" x="910" y="175"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_dZVnkBQSEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_dZVnkhQSEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnkxQSEeSwyuAkiSG7MA" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_z6xdkBfKEeShg7yWMgp7yA" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/inheritance"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_z6xdkRfKEeShg7yWMgp7yA"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlBQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnlRQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnlhQSEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnlxQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmBQSEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_dZVnmRQSEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_dZVnmhQSEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dZVnmxQSEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZVnkRQSEeSwyuAkiSG7MA" x="890" y="620"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_r_7yoBQUEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_r_8ZsBQUEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZsRQUEeSwyuAkiSG7MA" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_dZgmsBQSEeSwyuAkiSG7MA" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/specializedTypesID"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_dZgmsRQSEeSwyuAkiSG7MA"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_r_8ZshQUEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_8ZsxQUEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_r_8ZtBQUEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwBQUEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AwRQUEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_r_9AwhQUEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_r_9AwxQUEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_r_9AxBQUEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r_7yoRQUEeSwyuAkiSG7MA" x="420" y="1110"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_Rt13gBQXEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_Rt2ekBQXEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt2ekRQXEeSwyuAkiSG7MA" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt2ekhQXEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt2ekxQXEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoBQXEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FoRQXEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FohQXEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Rt3FoxQXEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Rt3FpBQXEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Rt3FpRQXEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//ContainerConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rt13gRQXEeSwyuAkiSG7MA" x="555" y="870"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_-uCeQBQZEeSwyuAkiSG7MA" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_-uDFUBQZEeSwyuAkiSG7MA" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDFURQZEeSwyuAkiSG7MA" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_rBv9ABQdEeSwyuAkiSG7MA" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//MetamodelTypeConfiguration/editHelperClassName"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rBv9ARQdEeSwyuAkiSG7MA"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDFUhQZEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDFUxQZEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYBQZEeSwyuAkiSG7MA" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsYRQZEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsYhQZEeSwyuAkiSG7MA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_-uDsYxQZEeSwyuAkiSG7MA" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_-uDsZBQZEeSwyuAkiSG7MA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_-uDsZRQZEeSwyuAkiSG7MA"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//MetamodelTypeConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uCeQRQZEeSwyuAkiSG7MA" x="105" y="1115"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_18yYoBfKEeShg7yWMgp7yA" type="2005" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_18yYohfKEeShg7yWMgp7yA" type="5005"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYoxfKEeShg7yWMgp7yA" type="7011">

+      <children xmi:type="notation:Node" xmi:id="_6FTtMBfKEeShg7yWMgp7yA" type="3009">

+        <element xmi:type="ecore:EEnumLiteral" href="ElementElementTypesConfigurations.ecore#//InheritanceKind/all"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6FTtMRfKEeShg7yWMgp7yA"/>

+      </children>

+      <children xmi:type="notation:Node" xmi:id="_7Ybh8BfKEeShg7yWMgp7yA" type="3009">

+        <element xmi:type="ecore:EEnumLiteral" href="ElementElementTypesConfigurations.ecore#//InheritanceKind/none"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7Ybh8RfKEeShg7yWMgp7yA"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpBfKEeShg7yWMgp7yA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYpRfKEeShg7yWMgp7yA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_18yYphfKEeShg7yWMgp7yA" type="7012">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_18yYpxfKEeShg7yWMgp7yA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_18yYqBfKEeShg7yWMgp7yA"/>

+    </children>

+    <element xmi:type="ecore:EEnum" href="ElementElementTypesConfigurations.ecore#//InheritanceKind"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_18yYoRfKEeShg7yWMgp7yA" x="1120" y="620"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_KdlD4BgSEeSAXuG_wvLrDw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KdlD4hgSEeSAXuG_wvLrDw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD4xgSEeSAXuG_wvLrDw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5BgSEeSAXuG_wvLrDw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD5RgSEeSAXuG_wvLrDw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_KdlD5hgSEeSAXuG_wvLrDw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_KdlD5xgSEeSAXuG_wvLrDw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_KdlD6BgSEeSAXuG_wvLrDw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Kdlq8BgSEeSAXuG_wvLrDw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_Kdlq8RgSEeSAXuG_wvLrDw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Kdlq8hgSEeSAXuG_wvLrDw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AbstractEditHelperAdviceConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdlD4RgSEeSAXuG_wvLrDw" x="1375" y="650"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_1pGfMMi9EeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_1pHtUMi9EeWPvPHRj0_oqw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtUci9EeWPvPHRj0_oqw" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_kjFZcMi9EeWPvPHRj0_oqw" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kjFZcci9EeWPvPHRj0_oqw"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtUsi9EeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtU8i9EeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtVMi9EeWPvPHRj0_oqw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtVci9EeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtVsi9EeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_1pHtV8i9EeWPvPHRj0_oqw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_1pHtWMi9EeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_1pHtWci9EeWPvPHRj0_oqw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1pGfMci9EeWPvPHRj0_oqw" x="1240" y="810"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_vzQJUMjBEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_vzQwYMjBEeWPvPHRj0_oqw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwYcjBEeWPvPHRj0_oqw" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_-VKBoMjDEeWPvPHRj0_oqw" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-VKBocjDEeWPvPHRj0_oqw"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwYsjBEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwY8jBEeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZMjBEeWPvPHRj0_oqw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwZcjBEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwZsjBEeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vzQwZ8jBEeWPvPHRj0_oqw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vzQwaMjBEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vzQwacjBEeWPvPHRj0_oqw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//AdviceBindingConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzQJUcjBEeWPvPHRj0_oqw" x="515" y="720"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_PI9n8MjCEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_PI-PAMjCEeWPvPHRj0_oqw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PAcjCEeWPvPHRj0_oqw" type="7001">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PAsjCEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PA8jCEeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PBMjCEeWPvPHRj0_oqw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PBcjCEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PBsjCEeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_PI-PB8jCEeWPvPHRj0_oqw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_PI-PCMjCEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_PI-PCcjCEeWPvPHRj0_oqw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//MatcherConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PI9n8cjCEeWPvPHRj0_oqw" x="1120" y="1050"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_WLo7QMmYEeWPvPHRj0_oqw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_WLo7QsmYEeWPvPHRj0_oqw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7Q8mYEeWPvPHRj0_oqw" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_SdpmlMmYEeWPvPHRj0_oqw" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmlcmYEeWPvPHRj0_oqw"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7RMmYEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7RcmYEeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7RsmYEeWPvPHRj0_oqw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7R8mYEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7SMmYEeWPvPHRj0_oqw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_WLo7ScmYEeWPvPHRj0_oqw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_WLo7SsmYEeWPvPHRj0_oqw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WLo7S8mYEeWPvPHRj0_oqw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//IdentifiedConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WLo7QcmYEeWPvPHRj0_oqw" x="680" y="535"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_jQEu8MppEeWPW4wup-qMUw" type="2001" fontName="Segoe UI">

+    <children xmi:type="notation:DecorationNode" xmi:id="_jQF9EMppEeWPW4wup-qMUw" type="5001"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkIMppEeWPW4wup-qMUw" type="7001">

+      <children xmi:type="notation:Node" xmi:id="_SdpmkMmYEeWPvPHRj0_oqw" type="3001">

+        <element xmi:type="ecore:EAttribute" href="ElementElementTypesConfigurations.ecore#//NamedConfiguration/name"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SdpmkcmYEeWPvPHRj0_oqw"/>

+      </children>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkIcppEeWPW4wup-qMUw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkIsppEeWPW4wup-qMUw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkI8ppEeWPW4wup-qMUw" type="7002">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJMppEeWPW4wup-qMUw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkJcppEeWPW4wup-qMUw"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_jQGkJsppEeWPW4wup-qMUw" type="7003">

+      <styles xmi:type="notation:SortingStyle" xmi:id="_jQGkJ8ppEeWPW4wup-qMUw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_jQGkKMppEeWPW4wup-qMUw"/>

+    </children>

+    <element xmi:type="ecore:EClass" href="ElementElementTypesConfigurations.ecore#//NamedConfiguration"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQEu8cppEeWPW4wup-qMUw" x="385" y="205"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_abOYARQPEeSwyuAkiSG7MA"/>

+  <element xmi:type="ecore:EPackage" href="ElementElementTypesConfigurations.ecore#/"/>

+  <edges xmi:type="notation:Connector" xmi:id="_daPmgBQSEeSwyuAkiSG7MA" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_daPmgxQSEeSwyuAkiSG7MA" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhBQSEeSwyuAkiSG7MA" x="-9" y="-72"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_daPmhRQSEeSwyuAkiSG7MA" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daPmhhQSEeSwyuAkiSG7MA" x="-5" y="-15"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_daPmgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/elementTypeConfigurations"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daPmghQSEeSwyuAkiSG7MA" points="[0, 0, 234, -337]$[-204, 293, 30, -44]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXUxQSEeSwyuAkiSG7MA" id="(0.3333333333333333,1.0)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbIXVBQSEeSwyuAkiSG7MA" id="(0.8641975308641975,0.14666666666666667)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_daTQ4BQSEeSwyuAkiSG7MA" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_daTQ4RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daTQ4hQSEeSwyuAkiSG7MA" points="[6, -29, 148, 280]$[6, -189, 148, 120]$[-142, -189, 0, 120]$[-142, -250, 0, 59]"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbI-YBQSEeSwyuAkiSG7MA" id="(0.48905109489051096,0.0)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_daYJYBQSEeSwyuAkiSG7MA" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_daYJYRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daYJYhQSEeSwyuAkiSG7MA" points="[0, -6, -78, 555]$[0, -441, -78, 120]$[78, -441, 0, 120]$[78, -502, 0, 59]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ERQSEeSwyuAkiSG7MA" id="(0.11728395061728394,0.08)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7EhQSEeSwyuAkiSG7MA" id="(0.16058394160583941,0.0)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_daZXgBQSEeSwyuAkiSG7MA" type="4003" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_dZTLUBQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-kBQSEeSwyuAkiSG7MA" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kRQSEeSwyuAkiSG7MA" x="4" y="-12"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_daZ-khQSEeSwyuAkiSG7MA" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daZ-kxQSEeSwyuAkiSG7MA" x="8" y="-23"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_daZXgRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ElementTypeConfiguration/iconEntry"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daZXghQSEeSwyuAkiSG7MA" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQhQSEeSwyuAkiSG7MA" id="(0.9135802469135802,0.14666666666666667)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHwQxQSEeSwyuAkiSG7MA" id="(0.032520325203252036,0.5333333333333333)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_daca0BQSEeSwyuAkiSG7MA" type="4004" source="_dZUZehQSEeSwyuAkiSG7MA" target="_dZTyYBQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_daca0RQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daca0hQSEeSwyuAkiSG7MA" points="[0, -4, 422, 82]$[0, -39, 422, 47]$[-422, -39, 0, 47]$[-422, -65, 0, 21]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7ExQSEeSwyuAkiSG7MA" id="(0.2868217054263566,0.054945054945054944)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbF7FBQSEeSwyuAkiSG7MA" id="(0.9854014598540146,0.6483516483516484)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_dagFMBQSEeSwyuAkiSG7MA" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZUZehQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_dagFMRQSEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dagFMhQSEeSwyuAkiSG7MA" points="[-2, -52, 22, 626]$[-22, -619, 2, 59]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNBQSEeSwyuAkiSG7MA" id="(0.4971751412429379,1.0)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dbHJNRQSEeSwyuAkiSG7MA" id="(0.5,0.0)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_s3NjcBQVEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjcxQVEeSwyuAkiSG7MA" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdBQVEeSwyuAkiSG7MA" x="-8" y="-64"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_s3NjdRQVEeSwyuAkiSG7MA" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_s3NjdhQVEeSwyuAkiSG7MA" x="-29" y="11"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_s3NjcRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/matcherConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3NjchQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BhqqsBfDEeShg7yWMgp7yA" id="(0.8705882352941177,0.8461538461538461)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_s3PYoBQVEeSwyuAkiSG7MA" type="4004" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_s3PYoRQVEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s3PYohQVEeSwyuAkiSG7MA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_hDfWYBQYEeSwyuAkiSG7MA" type="4003" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9cBQYEeSwyuAkiSG7MA" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cRQYEeSwyuAkiSG7MA" x="5" y="-39"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_hDf9chQYEeSwyuAkiSG7MA" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hDf9cxQYEeSwyuAkiSG7MA" x="-35" y="13"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_hDfWYRQYEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/containerConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hDfWYhQYEeSwyuAkiSG7MA" points="[-2, 4, 29, -100]$[-23, 75, 8, -29]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hDjn0BQYEeSwyuAkiSG7MA" id="(0.9529411764705882,0.6346153846153846)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_IGuE4BQaEeSwyuAkiSG7MA" type="4004" source="_-uCeQBQZEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_IGuE4RQaEeSwyuAkiSG7MA" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IGuE4hQaEeSwyuAkiSG7MA" points="[-2, -5, 97, 310]$[-94, -299, 5, 16]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcBQaEeSwyuAkiSG7MA" id="(0.5327102803738317,0.09615384615384616)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGzkcRQaEeSwyuAkiSG7MA" id="(0.2716049382716049,0.9866666666666667)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KdoHMBgSEeSAXuG_wvLrDw" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_KdlD4BgSEeSAXuG_wvLrDw">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHMxgSEeSAXuG_wvLrDw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNBgSEeSAXuG_wvLrDw" x="138" y="13"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KdoHNRgSEeSAXuG_wvLrDw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KdoHNhgSEeSAXuG_wvLrDw" x="162" y="23"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KdoHMRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/editHelperAdviceConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KdoHMhgSEeSAXuG_wvLrDw" points="[96, 0, -878, 463]$[974, 0, 0, 463]$[974, -437, 0, 26]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_Kdp8YBgSEeSAXuG_wvLrDw" type="4004" source="_KdlD4BgSEeSAXuG_wvLrDw" target="_dZUZehQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_Kdp8YRgSEeSAXuG_wvLrDw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Kdp8YhgSEeSAXuG_wvLrDw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KGvBIBv3EeSyLpQry5wnWQ" type="4003" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_dZVnkBQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQBv3EeSyLpQry5wnWQ" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQRv3EeSyLpQry5wnWQ" x="18" y="-79"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KGwPQhv3EeSyLpQry5wnWQ" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KGwPQxv3EeSyLpQry5wnWQ" y="60"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KGvBIRv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ElementTypeSetConfiguration/adviceBindingsConfigurations"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KGvBIhv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_KG2V4Bv3EeSyLpQry5wnWQ" type="4002" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_dZSkQxQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V4xv3EeSyLpQry5wnWQ" type="6001">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5Bv3EeSyLpQry5wnWQ" x="37" y="-10"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_KG2V5Rv3EeSyLpQry5wnWQ" type="6003">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_KG2V5hv3EeSyLpQry5wnWQ" x="40" y="-10"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_KG2V4Rv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration/target"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KG2V4hv3EeSyLpQry5wnWQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_QwLaUBv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_Rt13gBQXEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYBv3EeSyLpQry5wnWQ" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYRv3EeSyLpQry5wnWQ" x="29" y="68"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_QwMBYhv3EeSyLpQry5wnWQ" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_QwMBYxv3EeSyLpQry5wnWQ" x="7" y="-14"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_QwLaURv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/containerConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QwLaUhv3EeSyLpQry5wnWQ" points="[25, -29, -127, 149]$[151, -152, -1, 26]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_TqIqABv3EeSyLpQry5wnWQ" type="4003" source="_r_7yoBQUEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREBv3EeSyLpQry5wnWQ" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRERv3EeSyLpQry5wnWQ" x="87" y="38"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_TqJREhv3EeSyLpQry5wnWQ" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TqJRExv3EeSyLpQry5wnWQ" x="49" y="13"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_TqIqARv3EeSyLpQry5wnWQ" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//SpecializationTypeConfiguration/matcherConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TqIqAhv3EeSyLpQry5wnWQ" points="[7, -3, -434, 140]$[405, -129, -36, 14]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Bv3EeSyLpQry5wnWQ" id="(0.9633507853403142,0.22033898305084745)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TqRM4Rv3EeSyLpQry5wnWQ" id="(0.27932960893854747,0.7627118644067796)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_jEdp4Mi-EeWPvPHRj0_oqw" type="4004" source="_1pGfMMi9EeWPvPHRj0_oqw" target="_KdlD4BgSEeSAXuG_wvLrDw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_jEdp4ci-EeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jEdp4si-EeWPvPHRj0_oqw" points="[30, -29, -124, 89]$[96, -144, -58, -26]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_9jrzUMjBEeWPvPHRj0_oqw" type="4004" source="_vzQJUMjBEeWPvPHRj0_oqw" target="_dZVnkBQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_9jsaYMjBEeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9jsaYcjBEeWPvPHRj0_oqw" points="[32, -26, -107, 101]$[246, -134, 107, -7]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_SmnakMjCEeWPvPHRj0_oqw" type="4004" source="_PI9n8MjCEeWPvPHRj0_oqw" target="_dZTybBQSEeSwyuAkiSG7MA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_SmnakcjCEeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SmnaksjCEeWPvPHRj0_oqw" points="[-23, -26, 80, 86]$[-105, -141, -2, -29]"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_46pKoMjMEeWPvPHRj0_oqw" type="4003" source="_Rt13gBQXEeSwyuAkiSG7MA" target="_dZTybBQSEeSwyuAkiSG7MA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_46pxsMjMEeWPvPHRj0_oqw" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxscjMEeWPvPHRj0_oqw" x="-11" y="16"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_46pxssjMEeWPvPHRj0_oqw" type="6004">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_46pxs8jMEeWPvPHRj0_oqw" x="-3" y="-14"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_46pKocjMEeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xmi:type="ecore:EReference" href="ElementElementTypesConfigurations.ecore#//ContainerConfiguration/containerMatcherConfiguration"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_46pKosjMEeWPvPHRj0_oqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9Vx5MMjMEeWPvPHRj0_oqw" id="(0.9241379310344827,0.5576923076923077)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_ZTrDMMmYEeWPvPHRj0_oqw" type="4004" source="_dZVnkBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_ZTrDMcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZTrDMsmYEeWPvPHRj0_oqw" points="[-4, -3, 120, 89]$[-52, -89, 72, 3]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZTtfcMmYEeWPvPHRj0_oqw" id="(0.14018691588785046,0.05084745762711865)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_ZuldkMmYEeWPvPHRj0_oqw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_ZumEoMmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZumEocmYEeWPvPHRj0_oqw" points="[24, -15, -151, 84]$[104, -91, -71, 8]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZunSwMmYEeWPvPHRj0_oqw" id="(0.7777777777777778,0.2)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_aUOhQMmYEeWPvPHRj0_oqw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_WLo7QMmYEeWPvPHRj0_oqw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_aUOhQcmYEeWPvPHRj0_oqw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aUOhQsmYEeWPvPHRj0_oqw" points="[-1, 30, 0, -188]$[-26, 206, -25, -12]"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aUQWcMmYEeWPvPHRj0_oqw" id="(0.3006993006993007,0.23076923076923078)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_nnnW8MppEeWPW4wup-qMUw" type="4004" source="_dZSkQxQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_nnnW8cppEeWPW4wup-qMUw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nnnW8sppEeWPW4wup-qMUw" points="[11, -8, -135, 96]$[147, -74, 1, 30]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nnrBUMppEeWPW4wup-qMUw" id="(0.8333333333333334,0.10666666666666667)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2GZ7wMppEeWPW4wup-qMUw" id="(0.4621212121212121,0.8813559322033898)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_oA4LgMppEeWPW4wup-qMUw" type="4004" source="_dZR9MBQSEeSwyuAkiSG7MA" target="_jQEu8MppEeWPW4wup-qMUw">

+    <styles xmi:type="notation:FontStyle" xmi:id="_oA4LgcppEeWPW4wup-qMUw" fontName="Segoe UI"/>

+    <element xsi:nil="true"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oA4LgsppEeWPW4wup-qMUw" points="[0, -29, 116, 77]$[0, -59, 116, 47]$[-116, -59, 0, 47]$[-116, -100, 0, 6]"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_85h1YMppEeWPW4wup-qMUw" id="(0.7424242424242424,0.8983050847457628)"/>

+  </edges>

+</notation:Diagram>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
index 19bcc69c64c..415da032cf6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen"
-    editDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.infra.elementtypesconfigurations.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.infra.elementtypesconfigurations" modelName="ElementTypesConfigurations"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="7.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
+    modelDirectory="/org.eclipse.papyrus.infra.types/src-gen" editDirectory="/org.eclipse.papyrus.infra.types.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.infra.types.editor/src-gen" modelPluginID="org.eclipse.papyrus.infra.types"
+    modelName="ElementTypesConfigurations" editPluginClass="org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin"
+    editorPluginClass="org.eclipse.papyrus.infra.types.presentation.TypesConfigurationsEditorPlugin"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.infra.types.tests/src"
+    testSuiteClass="org.eclipse.papyrus.infra.types.tests.TypesConfigurationsAllTests"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
+    editPluginID="org.eclipse.papyrus.infra.types.edit" editorPluginID="org.eclipse.papyrus.infra.types.editor"
+    testsPluginID="org.eclipse.papyrus.infra.types.tests" operationReflection="true"
+    importOrganizing="true">
   <foreignModel>ElementTypesConfigurations.ecore</foreignModel>
-  <genPackages prefix="Elementtypesconfigurations" basePackage="org.eclipse.papyrus.infra"
+  <genPackages prefix="ElementTypesConfigurations" basePackage="org.eclipse.papyrus.infra"
       resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true"
-      contentTypeIdentifier="org.eclipse.papyrus.infra.elementtypesconfigurations"
+      contentTypeIdentifier="org.eclipse.papyrus.infra.types" fileExtensions="elementtypesconfigurations"
       ecorePackage="ElementTypesConfigurations.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="ElementTypesConfigurations.ecore#//InheritanceKind">
       <genEnumLiterals ecoreEnumLiteral="ElementTypesConfigurations.ecore#//InheritanceKind/none"/>
@@ -64,14 +68,13 @@
     <genClasses ecoreClass="ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//EditHelperAdviceConfiguration/editHelperAdviceClassName"/>
     </genClasses>
-    <genClasses ecoreClass="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration"
-        labelFeature="#//elementtypesconfigurations/IdentifiedConfiguration/identifier">
+    <genClasses ecoreClass="ElementTypesConfigurations.ecore#//AdviceBindingConfiguration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//AdviceBindingConfiguration/editHelperAdviceClassName"/>
     </genClasses>
     <genClasses ecoreClass="ElementTypesConfigurations.ecore#//MatcherConfiguration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//MatcherConfiguration/matcherClassName"/>
     </genClasses>
-    <genClasses ecoreClass="ElementTypesConfigurations.ecore#//IdentifiedConfiguration">
+    <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//IdentifiedConfiguration">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ElementTypesConfigurations.ecore#//IdentifiedConfiguration/identifier"/>
     </genClasses>
     <genClasses image="false" ecoreClass="ElementTypesConfigurations.ecore#//NamedConfiguration">
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties
new file mode 100644
index 00000000000..8c14283d007
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.properties
@@ -0,0 +1,16 @@
+# Copyright (c) 2014 CEA LIST.
+# 
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+pluginName = Papyrus elementTypes configurations Model
+providerName = Eclipse Modeling Project
+
+_UI_TypesConfigurations_content_type = TypesConfigurations File
+_UI_ElementTypesConfigurations_content_type = ElementTypesConfigurations File
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml
new file mode 100644
index 00000000000..f7e32708f06
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/plugin.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+ 
+ 
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ 
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <parser
+            type="elementtypesconfigurations"
+            class="org.eclipse.papyrus.infra.types.resource.CustomElementTypesConfigurationsResourceFactoryImpl"/>
+   </extension>
+  
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated ElementTypesConfigurations -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
+            class="org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage"
+            genModel="model/ElementTypesConfigurations.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.content_parser">
+      <!-- @generated ElementTypesConfigurations -->
+      <parser
+            contentTypeIdentifier="org.eclipse.papyrus.infra.types"
+            class="org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceFactoryImpl"/>
+   </extension>
+
+   <extension point="org.eclipse.core.contenttype.contentTypes">
+      <!-- @generated ElementTypesConfigurations -->
+      <content-type
+            base-type="org.eclipse.emf.ecore.xmi"
+            file-extensions="elementtypesconfigurations"
+            id="org.eclipse.papyrus.infra.types"
+            name="%_UI_ElementTypesConfigurations_content_type"
+            priority="normal">
+         <describer class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
+            <parameter name="namespace" value="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"/>
+            <parameter name="kind" value="xmi"/>
+         </describer>
+      </content-type>
+   </extension>
+</plugin>
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml
new file mode 100644
index 00000000000..eebc22ebb9f
--- /dev/null
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.infra-types</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.infra.types</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AbstractAdviceBindingConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java
index de9beb191c2..6809a81ffb5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AbstractAdviceBindingConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractAdviceBindingConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 
 /**
@@ -22,13 +22,13 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractAdviceBindingConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration()
  * @model abstract="true"
  * @generated
  */
@@ -43,14 +43,14 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see #setTarget(ElementTypeConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractAdviceBindingConfiguration_Target()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration_Target()
 	 * @model required="true"
 	 * @generated
 	 */
 	ElementTypeConfiguration getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Target</em>' reference.
@@ -69,14 +69,14 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Container Configuration</em>' containment reference.
 	 * @see #setContainerConfiguration(ContainerConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractAdviceBindingConfiguration_ContainerConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration_ContainerConfiguration()
 	 * @model containment="true"
 	 * @generated
 	 */
 	ContainerConfiguration getContainerConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Container Configuration</em>' containment reference.
@@ -95,14 +95,14 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Matcher Configuration</em>' containment reference.
 	 * @see #setMatcherConfiguration(AbstractMatcherConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractAdviceBindingConfiguration_MatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration_MatcherConfiguration()
 	 * @model containment="true"
 	 * @generated
 	 */
 	AbstractMatcherConfiguration getMatcherConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Matcher Configuration</em>' containment reference.
@@ -113,7 +113,7 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 
 	/**
 	 * Returns the value of the '<em><b>Inheritance</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind}.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.infra.types.InheritanceKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Inheritance</em>' attribute isn't clear,
@@ -121,20 +121,20 @@ public interface AbstractAdviceBindingConfiguration extends AdviceConfiguration,
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Inheritance</em>' attribute.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind
+	 * @see org.eclipse.papyrus.infra.types.InheritanceKind
 	 * @see #setInheritance(InheritanceKind)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractAdviceBindingConfiguration_Inheritance()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractAdviceBindingConfiguration_Inheritance()
 	 * @model required="true"
 	 * @generated
 	 */
 	InheritanceKind getInheritance();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Inheritance</em>' attribute.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind
+	 * @see org.eclipse.papyrus.infra.types.InheritanceKind
 	 * @see #getInheritance()
 	 * @generated
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AbstractEditHelperAdviceConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractEditHelperAdviceConfiguration.java
index e79ea12bd55..65ecb9a0cea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AbstractEditHelperAdviceConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractEditHelperAdviceConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 
 /**
@@ -22,17 +22,17 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractEditHelperAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractEditHelperAdviceConfiguration()
  * @model abstract="true"
  * @generated
  */
 public interface AbstractEditHelperAdviceConfiguration extends AdviceConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Target</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Target</em>' container reference isn't clear,
@@ -41,15 +41,15 @@ public interface AbstractEditHelperAdviceConfiguration extends AdviceConfigurati
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target</em>' container reference.
 	 * @see #setTarget(SpecializationTypeConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractEditHelperAdviceConfiguration_Target()
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractEditHelperAdviceConfiguration_Target()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration
 	 * @model opposite="editHelperAdviceConfiguration" required="true" transient="false"
 	 * @generated
 	 */
 	SpecializationTypeConfiguration getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Target</em>' container reference.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AbstractMatcherConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractMatcherConfiguration.java
index be4d45ee431..dc12be8df02 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AbstractMatcherConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AbstractMatcherConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAbstractMatcherConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAbstractMatcherConfiguration()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceBindingConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceBindingConfiguration.java
index a6367d8dc13..5075aab461f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceBindingConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceBindingConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 
 /**
@@ -22,10 +22,10 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceBindingConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceBindingConfiguration()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface AdviceBindingConfiguration extends AbstractAdviceBindingConfigu
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Edit Helper Advice Class Name</em>' attribute.
 	 * @see #setEditHelperAdviceClassName(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceBindingConfiguration_EditHelperAdviceClassName()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceBindingConfiguration_EditHelperAdviceClassName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getEditHelperAdviceClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Edit Helper Advice Class Name</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java
index e0d662673be..edcfa3ea072 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/AdviceConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/AdviceConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getBefore <em>Before</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getAfter <em>After</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getBefore <em>Before</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getAfter <em>After</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceConfiguration()
  * @model abstract="true"
  * @generated
  */
@@ -42,7 +42,7 @@ public interface AdviceConfiguration extends ConfigurationElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Before</em>' attribute list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceConfiguration_Before()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceConfiguration_Before()
 	 * @model
 	 * @generated
 	 */
@@ -58,7 +58,7 @@ public interface AdviceConfiguration extends ConfigurationElement {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>After</em>' attribute list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getAdviceConfiguration_After()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getAdviceConfiguration_After()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ConfigurationElement.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ConfigurationElement.java
index d455b78e963..7a3c8c03bbe 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ConfigurationElement.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ConfigurationElement.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getDescription <em>Description</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getConfigurationElement()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement()
  * @model abstract="true"
  * @generated
  */
@@ -41,14 +41,14 @@ public interface ConfigurationElement extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getConfigurationElement_Description()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getConfigurationElement_Description()
 	 * @model
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ContainerConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ContainerConfiguration.java
index 6a85cf1b529..18b45b949e0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ContainerConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ContainerConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.EReference;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getContainerConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getContainerConfiguration()
  * @model
  * @generated
  */
@@ -45,14 +45,14 @@ public interface ContainerConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Container Matcher Configuration</em>' containment reference.
 	 * @see #setContainerMatcherConfiguration(AbstractMatcherConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getContainerConfiguration_ContainerMatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getContainerConfiguration_ContainerMatcherConfiguration()
 	 * @model containment="true"
 	 * @generated
 	 */
 	AbstractMatcherConfiguration getContainerMatcherConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Container Matcher Configuration</em>' containment reference.
@@ -71,7 +71,7 @@ public interface ContainerConfiguration extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>EContainment Features</em>' reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getContainerConfiguration_EContainmentFeatures()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getContainerConfiguration_EContainmentFeatures()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/EditHelperAdviceConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/EditHelperAdviceConfiguration.java
index 7f40b356e16..4fe968c863e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/EditHelperAdviceConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/EditHelperAdviceConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 
 /**
@@ -22,10 +22,10 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getEditHelperAdviceConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getEditHelperAdviceConfiguration()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface EditHelperAdviceConfiguration extends AbstractEditHelperAdviceC
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Edit Helper Advice Class Name</em>' attribute.
 	 * @see #setEditHelperAdviceClassName(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getEditHelperAdviceConfiguration_EditHelperAdviceClassName()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getEditHelperAdviceConfiguration_EditHelperAdviceClassName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getEditHelperAdviceClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Edit Helper Advice Class Name</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeConfiguration.java
index 111d05ec07d..f8cc2aff66b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 
 /**
@@ -22,12 +22,12 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getHint <em>Hint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getHint <em>Hint</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration()
  * @model abstract="true"
  * @generated
  */
@@ -43,14 +43,14 @@ public interface ElementTypeConfiguration extends ConfigurationElement, Identifi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Hint</em>' attribute.
 	 * @see #setHint(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeConfiguration_Hint()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration_Hint()
 	 * @model default=""
 	 * @generated
 	 */
 	String getHint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getHint <em>Hint</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getHint <em>Hint</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Hint</em>' attribute.
@@ -70,14 +70,14 @@ public interface ElementTypeConfiguration extends ConfigurationElement, Identifi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Kind</em>' attribute.
 	 * @see #setKind(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeConfiguration_Kind()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration_Kind()
 	 * @model default="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
 	 * @generated
 	 */
 	String getKind();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getKind <em>Kind</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getKind <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Kind</em>' attribute.
@@ -96,14 +96,14 @@ public interface ElementTypeConfiguration extends ConfigurationElement, Identifi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Icon Entry</em>' containment reference.
 	 * @see #setIconEntry(IconEntry)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeConfiguration_IconEntry()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeConfiguration_IconEntry()
 	 * @model containment="true"
 	 * @generated
 	 */
 	IconEntry getIconEntry();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Icon Entry</em>' containment reference.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeSetConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeSetConfiguration.java
index f036e3464d4..32cc941fcf2 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementTypeSetConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypeSetConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,19 +23,19 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeSetConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeSetConfiguration()
  * @model
  * @generated
  */
 public interface ElementTypeSetConfiguration extends ConfigurationElement, IdentifiedConfiguration, NamedConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Element Type Configurations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Element Type Configurations</em>' containment reference list isn't clear,
@@ -43,7 +43,7 @@ public interface ElementTypeSetConfiguration extends ConfigurationElement, Ident
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element Type Configurations</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeSetConfiguration_ElementTypeConfigurations()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeSetConfiguration_ElementTypeConfigurations()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -51,7 +51,7 @@ public interface ElementTypeSetConfiguration extends ConfigurationElement, Ident
 
 	/**
 	 * Returns the value of the '<em><b>Advice Bindings Configurations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration}.
+	 * The list contents are of type {@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Advice Bindings Configurations</em>' containment reference list isn't clear,
@@ -59,7 +59,7 @@ public interface ElementTypeSetConfiguration extends ConfigurationElement, Ident
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Advice Bindings Configurations</em>' containment reference list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeSetConfiguration_AdviceBindingsConfigurations()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeSetConfiguration_AdviceBindingsConfigurations()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -75,14 +75,14 @@ public interface ElementTypeSetConfiguration extends ConfigurationElement, Ident
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Metamodel Ns URI</em>' attribute.
 	 * @see #setMetamodelNsURI(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getElementTypeSetConfiguration_MetamodelNsURI()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getElementTypeSetConfiguration_MetamodelNsURI()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getMetamodelNsURI();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Metamodel Ns URI</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementtypesconfigurationsFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java
index e4cb47f4ed4..f0363fad6a4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementtypesconfigurationsFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,17 +19,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage
  * @generated
  */
-public interface ElementtypesconfigurationsFactory extends EFactory {
+public interface ElementTypesConfigurationsFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ElementtypesconfigurationsFactory eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsFactoryImpl.init();
+	ElementTypesConfigurationsFactory eINSTANCE = org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Element Type Set Configuration</em>'.
@@ -110,6 +110,6 @@ public interface ElementtypesconfigurationsFactory extends EFactory {
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	ElementtypesconfigurationsPackage getElementtypesconfigurationsPackage();
+	ElementTypesConfigurationsPackage getElementTypesConfigurationsPackage();
 
-} //ElementtypesconfigurationsFactory
+} //ElementTypesConfigurationsFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementtypesconfigurationsPackage.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
index 23de7d497f8..52fef5f47b0 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/ElementtypesconfigurationsPackage.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/ElementTypesConfigurationsPackage.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -30,18 +30,18 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory
  * @model kind="package"
  * @generated
  */
-public interface ElementtypesconfigurationsPackage extends EPackage {
+public interface ElementTypesConfigurationsPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "elementtypesconfigurations";
+	String eNAME = "types";
 
 	/**
 	 * The package namespace URI.
@@ -65,7 +65,7 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eCONTENT_TYPE = "org.eclipse.papyrus.infra.elementtypesconfigurations";
+	String eCONTENT_TYPE = "org.eclipse.papyrus.infra.types";
 
 	/**
 	 * The singleton instance of the package.
@@ -73,14 +73,14 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ElementtypesconfigurationsPackage eINSTANCE = org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl.init();
+	ElementTypesConfigurationsPackage eINSTANCE = org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl <em>Configuration Element</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl <em>Configuration Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getConfigurationElement()
+	 * @see org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getConfigurationElement()
 	 * @generated
 	 */
 	int CONFIGURATION_ELEMENT = 3;
@@ -113,11 +113,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int CONFIGURATION_ELEMENT_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl <em>Element Type Set Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl <em>Element Type Set Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getElementTypeSetConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getElementTypeSetConfiguration()
 	 * @generated
 	 */
 	int ELEMENT_TYPE_SET_CONFIGURATION = 0;
@@ -195,11 +195,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_SET_CONFIGURATION_OPERATION_COUNT = CONFIGURATION_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl <em>Element Type Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl <em>Element Type Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getElementTypeConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getElementTypeConfiguration()
 	 * @generated
 	 */
 	int ELEMENT_TYPE_CONFIGURATION = 1;
@@ -277,11 +277,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ELEMENT_TYPE_CONFIGURATION_OPERATION_COUNT = CONFIGURATION_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl <em>Icon Entry</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.IconEntryImpl <em>Icon Entry</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getIconEntry()
+	 * @see org.eclipse.papyrus.infra.types.impl.IconEntryImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIconEntry()
 	 * @generated
 	 */
 	int ICON_ENTRY = 2;
@@ -323,11 +323,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ICON_ENTRY_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl <em>Abstract Matcher Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl <em>Abstract Matcher Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAbstractMatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractMatcherConfiguration()
 	 * @generated
 	 */
 	int ABSTRACT_MATCHER_CONFIGURATION = 4;
@@ -351,11 +351,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl <em>Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl <em>Advice Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAdviceConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceConfiguration()
 	 * @generated
 	 */
 	int ADVICE_CONFIGURATION = 5;
@@ -406,11 +406,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ADVICE_CONFIGURATION_OPERATION_COUNT = CONFIGURATION_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl <em>Abstract Advice Binding Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl <em>Abstract Advice Binding Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAbstractAdviceBindingConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractAdviceBindingConfiguration()
 	 * @generated
 	 */
 	int ABSTRACT_ADVICE_BINDING_CONFIGURATION = 6;
@@ -506,11 +506,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT = ADVICE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getSpecializationTypeConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getSpecializationTypeConfiguration()
 	 * @generated
 	 */
 	int SPECIALIZATION_TYPE_CONFIGURATION = 7;
@@ -624,11 +624,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int SPECIALIZATION_TYPE_CONFIGURATION_OPERATION_COUNT = ELEMENT_TYPE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getContainerConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getContainerConfiguration()
 	 * @generated
 	 */
 	int CONTAINER_CONFIGURATION = 8;
@@ -670,11 +670,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int CONTAINER_CONFIGURATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getMetamodelTypeConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMetamodelTypeConfiguration()
 	 * @generated
 	 */
 	int METAMODEL_TYPE_CONFIGURATION = 9;
@@ -770,11 +770,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int METAMODEL_TYPE_CONFIGURATION_OPERATION_COUNT = ELEMENT_TYPE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl <em>Abstract Edit Helper Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl <em>Abstract Edit Helper Advice Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration()
 	 * @generated
 	 */
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = 10;
@@ -834,11 +834,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT = ADVICE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl <em>Edit Helper Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl <em>Edit Helper Advice Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getEditHelperAdviceConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getEditHelperAdviceConfiguration()
 	 * @generated
 	 */
 	int EDIT_HELPER_ADVICE_CONFIGURATION = 11;
@@ -907,11 +907,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT = ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl <em>Advice Binding Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl <em>Advice Binding Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAdviceBindingConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceBindingConfiguration()
 	 * @generated
 	 */
 	int ADVICE_BINDING_CONFIGURATION = 12;
@@ -1016,11 +1016,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT = ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MatcherConfigurationImpl
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getMatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMatcherConfiguration()
 	 * @generated
 	 */
 	int MATCHER_CONFIGURATION = 13;
@@ -1053,11 +1053,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int MATCHER_CONFIGURATION_OPERATION_COUNT = ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getIdentifiedConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIdentifiedConfiguration()
 	 * @generated
 	 */
 	int IDENTIFIED_CONFIGURATION = 14;
@@ -1090,11 +1090,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int IDENTIFIED_CONFIGURATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getNamedConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.NamedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getNamedConfiguration()
 	 * @generated
 	 */
 	int NAMED_CONFIGURATION = 15;
@@ -1127,501 +1127,501 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	int NAMED_CONFIGURATION_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind <em>Inheritance Kind</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.types.InheritanceKind <em>Inheritance Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getInheritanceKind()
+	 * @see org.eclipse.papyrus.infra.types.InheritanceKind
+	 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getInheritanceKind()
 	 * @generated
 	 */
 	int INHERITANCE_KIND = 16;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration <em>Element Type Set Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration <em>Element Type Set Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Element Type Set Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration
 	 * @generated
 	 */
 	EClass getElementTypeSetConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getElementTypeConfigurations <em>Element Type Configurations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Element Type Configurations</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getElementTypeConfigurations()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getElementTypeConfigurations()
 	 * @see #getElementTypeSetConfiguration()
 	 * @generated
 	 */
 	EReference getElementTypeSetConfiguration_ElementTypeConfigurations();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Advice Bindings Configurations</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getAdviceBindingsConfigurations()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getAdviceBindingsConfigurations()
 	 * @see #getElementTypeSetConfiguration()
 	 * @generated
 	 */
 	EReference getElementTypeSetConfiguration_AdviceBindingsConfigurations();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getMetamodelNsURI <em>Metamodel Ns URI</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Metamodel Ns URI</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration#getMetamodelNsURI()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration#getMetamodelNsURI()
 	 * @see #getElementTypeSetConfiguration()
 	 * @generated
 	 */
 	EAttribute getElementTypeSetConfiguration_MetamodelNsURI();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Element Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 	 * @generated
 	 */
 	EClass getElementTypeConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getHint <em>Hint</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getHint <em>Hint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Hint</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getHint()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getHint()
 	 * @see #getElementTypeConfiguration()
 	 * @generated
 	 */
 	EAttribute getElementTypeConfiguration_Hint();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getKind <em>Kind</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getKind <em>Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Kind</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getKind()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getKind()
 	 * @see #getElementTypeConfiguration()
 	 * @generated
 	 */
 	EAttribute getElementTypeConfiguration_Kind();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getIconEntry <em>Icon Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Icon Entry</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration#getIconEntry()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration#getIconEntry()
 	 * @see #getElementTypeConfiguration()
 	 * @generated
 	 */
 	EReference getElementTypeConfiguration_IconEntry();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry <em>Icon Entry</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.IconEntry <em>Icon Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Icon Entry</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry
+	 * @see org.eclipse.papyrus.infra.types.IconEntry
 	 * @generated
 	 */
 	EClass getIconEntry();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getIconPath <em>Icon Path</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.IconEntry#getIconPath <em>Icon Path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Icon Path</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getIconPath()
+	 * @see org.eclipse.papyrus.infra.types.IconEntry#getIconPath()
 	 * @see #getIconEntry()
 	 * @generated
 	 */
 	EAttribute getIconEntry_IconPath();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getBundleId <em>Bundle Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.IconEntry#getBundleId <em>Bundle Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Bundle Id</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getBundleId()
+	 * @see org.eclipse.papyrus.infra.types.IconEntry#getBundleId()
 	 * @see #getIconEntry()
 	 * @generated
 	 */
 	EAttribute getIconEntry_BundleId();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Configuration Element</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	EClass getConfigurationElement();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.ConfigurationElement#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement#getDescription()
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement#getDescription()
 	 * @see #getConfigurationElement()
 	 * @generated
 	 */
 	EAttribute getConfigurationElement_Description();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration <em>Abstract Matcher Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration <em>Abstract Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Abstract Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration
 	 * @generated
 	 */
 	EClass getAbstractMatcherConfiguration();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration <em>Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration <em>Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration
 	 * @generated
 	 */
 	EClass getAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getBefore <em>Before</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getBefore <em>Before</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Before</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getBefore()
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration#getBefore()
 	 * @see #getAdviceConfiguration()
 	 * @generated
 	 */
 	EAttribute getAdviceConfiguration_Before();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getAfter <em>After</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration#getAfter <em>After</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>After</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration#getAfter()
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration#getAfter()
 	 * @see #getAdviceConfiguration()
 	 * @generated
 	 */
 	EAttribute getAdviceConfiguration_After();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Abstract Advice Binding Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
 	 * @generated
 	 */
 	EClass getAbstractAdviceBindingConfiguration();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getTarget()
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getTarget()
 	 * @see #getAbstractAdviceBindingConfiguration()
 	 * @generated
 	 */
 	EReference getAbstractAdviceBindingConfiguration_Target();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Container Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getContainerConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getContainerConfiguration()
 	 * @see #getAbstractAdviceBindingConfiguration()
 	 * @generated
 	 */
 	EReference getAbstractAdviceBindingConfiguration_ContainerConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getMatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getMatcherConfiguration()
 	 * @see #getAbstractAdviceBindingConfiguration()
 	 * @generated
 	 */
 	EReference getAbstractAdviceBindingConfiguration_MatcherConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getInheritance <em>Inheritance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Inheritance</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration#getInheritance()
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration#getInheritance()
 	 * @see #getAbstractAdviceBindingConfiguration()
 	 * @generated
 	 */
 	EAttribute getAbstractAdviceBindingConfiguration_Inheritance();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Specialization Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration
 	 * @generated
 	 */
 	EClass getSpecializationTypeConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Specialized Types ID</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getSpecializedTypesID()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypesID()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
 	 */
 	EAttribute getSpecializationTypeConfiguration_SpecializedTypesID();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Edit Helper Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
 	 */
 	EReference getSpecializationTypeConfiguration_EditHelperAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Container Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getContainerConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
 	 */
 	EReference getSpecializationTypeConfiguration_ContainerConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getMatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration()
 	 * @see #getSpecializationTypeConfiguration()
 	 * @generated
 	 */
 	EReference getSpecializationTypeConfiguration_MatcherConfiguration();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration <em>Container Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration <em>Container Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Container Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ContainerConfiguration
 	 * @generated
 	 */
 	EClass getContainerConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Container Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getContainerMatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.ContainerConfiguration#getContainerMatcherConfiguration()
 	 * @see #getContainerConfiguration()
 	 * @generated
 	 */
 	EReference getContainerConfiguration_ContainerMatcherConfiguration();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration#getEContainmentFeatures <em>EContainment Features</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>EContainment Features</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration#getEContainmentFeatures()
+	 * @see org.eclipse.papyrus.infra.types.ContainerConfiguration#getEContainmentFeatures()
 	 * @see #getContainerConfiguration()
 	 * @generated
 	 */
 	EReference getContainerConfiguration_EContainmentFeatures();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration <em>Metamodel Type Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration <em>Metamodel Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Metamodel Type Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration
 	 * @generated
 	 */
 	EClass getMetamodelTypeConfiguration();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEClass <em>EClass</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEClass <em>EClass</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>EClass</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEClass()
+	 * @see org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEClass()
 	 * @see #getMetamodelTypeConfiguration()
 	 * @generated
 	 */
 	EReference getMetamodelTypeConfiguration_EClass();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Edit Helper Class Name</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEditHelperClassName()
+	 * @see org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEditHelperClassName()
 	 * @see #getMetamodelTypeConfiguration()
 	 * @generated
 	 */
 	EAttribute getMetamodelTypeConfiguration_EditHelperClassName();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration <em>Abstract Edit Helper Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration <em>Abstract Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Abstract Edit Helper Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration
 	 * @generated
 	 */
 	EClass getAbstractEditHelperAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration#getTarget()
+	 * @see org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget()
 	 * @see #getAbstractEditHelperAdviceConfiguration()
 	 * @generated
 	 */
 	EReference getAbstractEditHelperAdviceConfiguration_Target();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Edit Helper Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration
 	 * @generated
 	 */
 	EClass getEditHelperAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Edit Helper Advice Class Name</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration#getEditHelperAdviceClassName()
+	 * @see org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration#getEditHelperAdviceClassName()
 	 * @see #getEditHelperAdviceConfiguration()
 	 * @generated
 	 */
 	EAttribute getEditHelperAdviceConfiguration_EditHelperAdviceClassName();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration <em>Advice Binding Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration <em>Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Advice Binding Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceBindingConfiguration
 	 * @generated
 	 */
 	EClass getAdviceBindingConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Edit Helper Advice Class Name</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration#getEditHelperAdviceClassName()
+	 * @see org.eclipse.papyrus.infra.types.AdviceBindingConfiguration#getEditHelperAdviceClassName()
 	 * @see #getAdviceBindingConfiguration()
 	 * @generated
 	 */
 	EAttribute getAdviceBindingConfiguration_EditHelperAdviceClassName();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.MatcherConfiguration <em>Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration
+	 * @see org.eclipse.papyrus.infra.types.MatcherConfiguration
 	 * @generated
 	 */
 	EClass getMatcherConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Matcher Class Name</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration#getMatcherClassName()
+	 * @see org.eclipse.papyrus.infra.types.MatcherConfiguration#getMatcherClassName()
 	 * @see #getMatcherConfiguration()
 	 * @generated
 	 */
 	EAttribute getMatcherConfiguration_MatcherClassName();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Identified Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	EClass getIdentifiedConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration#getIdentifier()
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration#getIdentifier()
 	 * @see #getIdentifiedConfiguration()
 	 * @generated
 	 */
 	EAttribute getIdentifiedConfiguration_Identifier();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Named Configuration</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.NamedConfiguration
 	 * @generated
 	 */
 	EClass getNamedConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.types.NamedConfiguration#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration#getName()
+	 * @see org.eclipse.papyrus.infra.types.NamedConfiguration#getName()
 	 * @see #getNamedConfiguration()
 	 * @generated
 	 */
 	EAttribute getNamedConfiguration_Name();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind <em>Inheritance Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.infra.types.InheritanceKind <em>Inheritance Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Inheritance Kind</em>'.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind
+	 * @see org.eclipse.papyrus.infra.types.InheritanceKind
 	 * @generated
 	 */
 	EEnum getInheritanceKind();
@@ -1633,7 +1633,7 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	ElementtypesconfigurationsFactory getElementtypesconfigurationsFactory();
+	ElementTypesConfigurationsFactory getElementTypesConfigurationsFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -1650,11 +1650,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl <em>Element Type Set Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl <em>Element Type Set Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getElementTypeSetConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getElementTypeSetConfiguration()
 		 * @generated
 		 */
 		EClass ELEMENT_TYPE_SET_CONFIGURATION = eINSTANCE.getElementTypeSetConfiguration();
@@ -1684,11 +1684,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI = eINSTANCE.getElementTypeSetConfiguration_MetamodelNsURI();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl <em>Element Type Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl <em>Element Type Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getElementTypeConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getElementTypeConfiguration()
 		 * @generated
 		 */
 		EClass ELEMENT_TYPE_CONFIGURATION = eINSTANCE.getElementTypeConfiguration();
@@ -1718,11 +1718,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EReference ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY = eINSTANCE.getElementTypeConfiguration_IconEntry();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl <em>Icon Entry</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.IconEntryImpl <em>Icon Entry</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getIconEntry()
+		 * @see org.eclipse.papyrus.infra.types.impl.IconEntryImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIconEntry()
 		 * @generated
 		 */
 		EClass ICON_ENTRY = eINSTANCE.getIconEntry();
@@ -1744,11 +1744,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute ICON_ENTRY__BUNDLE_ID = eINSTANCE.getIconEntry_BundleId();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl <em>Configuration Element</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl <em>Configuration Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getConfigurationElement()
+		 * @see org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getConfigurationElement()
 		 * @generated
 		 */
 		EClass CONFIGURATION_ELEMENT = eINSTANCE.getConfigurationElement();
@@ -1762,21 +1762,21 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute CONFIGURATION_ELEMENT__DESCRIPTION = eINSTANCE.getConfigurationElement_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl <em>Abstract Matcher Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl <em>Abstract Matcher Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAbstractMatcherConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractMatcherConfiguration()
 		 * @generated
 		 */
 		EClass ABSTRACT_MATCHER_CONFIGURATION = eINSTANCE.getAbstractMatcherConfiguration();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl <em>Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl <em>Advice Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAdviceConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceConfiguration()
 		 * @generated
 		 */
 		EClass ADVICE_CONFIGURATION = eINSTANCE.getAdviceConfiguration();
@@ -1798,11 +1798,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute ADVICE_CONFIGURATION__AFTER = eINSTANCE.getAdviceConfiguration_After();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl <em>Abstract Advice Binding Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl <em>Abstract Advice Binding Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAbstractAdviceBindingConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractAdviceBindingConfiguration()
 		 * @generated
 		 */
 		EClass ABSTRACT_ADVICE_BINDING_CONFIGURATION = eINSTANCE.getAbstractAdviceBindingConfiguration();
@@ -1840,11 +1840,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE = eINSTANCE.getAbstractAdviceBindingConfiguration_Inheritance();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl <em>Specialization Type Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getSpecializationTypeConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getSpecializationTypeConfiguration()
 		 * @generated
 		 */
 		EClass SPECIALIZATION_TYPE_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration();
@@ -1882,11 +1882,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EReference SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION = eINSTANCE.getSpecializationTypeConfiguration_MatcherConfiguration();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl <em>Container Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getContainerConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getContainerConfiguration()
 		 * @generated
 		 */
 		EClass CONTAINER_CONFIGURATION = eINSTANCE.getContainerConfiguration();
@@ -1908,11 +1908,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EReference CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES = eINSTANCE.getContainerConfiguration_EContainmentFeatures();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl <em>Metamodel Type Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getMetamodelTypeConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMetamodelTypeConfiguration()
 		 * @generated
 		 */
 		EClass METAMODEL_TYPE_CONFIGURATION = eINSTANCE.getMetamodelTypeConfiguration();
@@ -1934,11 +1934,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME = eINSTANCE.getMetamodelTypeConfiguration_EditHelperClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl <em>Abstract Edit Helper Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl <em>Abstract Edit Helper Advice Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAbstractEditHelperAdviceConfiguration()
 		 * @generated
 		 */
 		EClass ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION = eINSTANCE.getAbstractEditHelperAdviceConfiguration();
@@ -1952,11 +1952,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EReference ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET = eINSTANCE.getAbstractEditHelperAdviceConfiguration_Target();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl <em>Edit Helper Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl <em>Edit Helper Advice Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getEditHelperAdviceConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getEditHelperAdviceConfiguration()
 		 * @generated
 		 */
 		EClass EDIT_HELPER_ADVICE_CONFIGURATION = eINSTANCE.getEditHelperAdviceConfiguration();
@@ -1970,11 +1970,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME = eINSTANCE.getEditHelperAdviceConfiguration_EditHelperAdviceClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl <em>Advice Binding Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl <em>Advice Binding Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getAdviceBindingConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getAdviceBindingConfiguration()
 		 * @generated
 		 */
 		EClass ADVICE_BINDING_CONFIGURATION = eINSTANCE.getAdviceBindingConfiguration();
@@ -1988,11 +1988,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME = eINSTANCE.getAdviceBindingConfiguration_EditHelperAdviceClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl <em>Matcher Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MatcherConfigurationImpl
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getMatcherConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getMatcherConfiguration()
 		 * @generated
 		 */
 		EClass MATCHER_CONFIGURATION = eINSTANCE.getMatcherConfiguration();
@@ -2006,11 +2006,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute MATCHER_CONFIGURATION__MATCHER_CLASS_NAME = eINSTANCE.getMatcherConfiguration_MatcherClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getIdentifiedConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getIdentifiedConfiguration()
 		 * @generated
 		 */
 		EClass IDENTIFIED_CONFIGURATION = eINSTANCE.getIdentifiedConfiguration();
@@ -2024,11 +2024,11 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute IDENTIFIED_CONFIGURATION__IDENTIFIER = eINSTANCE.getIdentifiedConfiguration_Identifier();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getNamedConfiguration()
+		 * @see org.eclipse.papyrus.infra.types.NamedConfiguration
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getNamedConfiguration()
 		 * @generated
 		 */
 		EClass NAMED_CONFIGURATION = eINSTANCE.getNamedConfiguration();
@@ -2042,15 +2042,15 @@ public interface ElementtypesconfigurationsPackage extends EPackage {
 		EAttribute NAMED_CONFIGURATION__NAME = eINSTANCE.getNamedConfiguration_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind <em>Inheritance Kind</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.types.InheritanceKind <em>Inheritance Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind
-		 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementtypesconfigurationsPackageImpl#getInheritanceKind()
+		 * @see org.eclipse.papyrus.infra.types.InheritanceKind
+		 * @see org.eclipse.papyrus.infra.types.impl.ElementTypesConfigurationsPackageImpl#getInheritanceKind()
 		 * @generated
 		 */
 		EEnum INHERITANCE_KIND = eINSTANCE.getInheritanceKind();
 
 	}
 
-} //ElementtypesconfigurationsPackage
+} //ElementTypesConfigurationsPackage
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IconEntry.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/IconEntry.java
index 821e2fac6fb..042ee736012 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IconEntry.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/IconEntry.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getIconPath <em>Icon Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getBundleId <em>Bundle Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.IconEntry#getIconPath <em>Icon Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.IconEntry#getBundleId <em>Bundle Id</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getIconEntry()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getIconEntry()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface IconEntry extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Icon Path</em>' attribute.
 	 * @see #setIconPath(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getIconEntry_IconPath()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getIconEntry_IconPath()
 	 * @model
 	 * @generated
 	 */
 	String getIconPath();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getIconPath <em>Icon Path</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.IconEntry#getIconPath <em>Icon Path</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Icon Path</em>' attribute.
@@ -68,14 +68,14 @@ public interface IconEntry extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Bundle Id</em>' attribute.
 	 * @see #setBundleId(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getIconEntry_BundleId()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getIconEntry_BundleId()
 	 * @model
 	 * @generated
 	 */
 	String getBundleId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.IconEntry#getBundleId <em>Bundle Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Bundle Id</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IdentifiedConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/IdentifiedConfiguration.java
index 0119ff2f154..d371ad41302 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/IdentifiedConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/IdentifiedConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration#getIdentifier <em>Identifier</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getIdentifiedConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getIdentifiedConfiguration()
  * @model interface="true" abstract="true"
  * @generated
  */
@@ -41,14 +41,14 @@ public interface IdentifiedConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getIdentifiedConfiguration_Identifier()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getIdentifiedConfiguration_Identifier()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration#getIdentifier <em>Identifier</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration#getIdentifier <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/InheritanceKind.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java
index b097b47eb38..2aec2cf1a44 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/InheritanceKind.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/InheritanceKind.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Inheritance Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getInheritanceKind()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getInheritanceKind()
  * @model
  * @generated
  */
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MatcherConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/MatcherConfiguration.java
index fc367dce745..2094bd380f3 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MatcherConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/MatcherConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 
 /**
@@ -22,10 +22,10 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMatcherConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getMatcherConfiguration()
  * @model
  * @generated
  */
@@ -40,14 +40,14 @@ public interface MatcherConfiguration extends AbstractMatcherConfiguration {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Matcher Class Name</em>' attribute.
 	 * @see #setMatcherClassName(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMatcherConfiguration_MatcherClassName()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getMatcherConfiguration_MatcherClassName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getMatcherClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.MatcherConfiguration#getMatcherClassName <em>Matcher Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Matcher Class Name</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MetamodelTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/MetamodelTypeConfiguration.java
index 74a8897911a..96e707eacbf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/MetamodelTypeConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/MetamodelTypeConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EClass;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.EClass;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEClass <em>EClass</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEClass <em>EClass</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMetamodelTypeConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getMetamodelTypeConfiguration()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface MetamodelTypeConfiguration extends ElementTypeConfiguration {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>EClass</em>' reference.
 	 * @see #setEClass(EClass)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMetamodelTypeConfiguration_EClass()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getMetamodelTypeConfiguration_EClass()
 	 * @model
 	 * @generated
 	 */
 	EClass getEClass();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEClass <em>EClass</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEClass <em>EClass</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>EClass</em>' reference.
@@ -68,14 +68,14 @@ public interface MetamodelTypeConfiguration extends ElementTypeConfiguration {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Edit Helper Class Name</em>' attribute.
 	 * @see #setEditHelperClassName(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getMetamodelTypeConfiguration_EditHelperClassName()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getMetamodelTypeConfiguration_EditHelperClassName()
 	 * @model
 	 * @generated
 	 */
 	String getEditHelperClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration#getEditHelperClassName <em>Edit Helper Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Edit Helper Class Name</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/NamedConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/NamedConfiguration.java
index 9ee7476ae17..4be63a904e4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/NamedConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/NamedConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,10 +23,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.NamedConfiguration#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getNamedConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getNamedConfiguration()
  * @model interface="true" abstract="true"
  * @generated
  */
@@ -41,14 +41,14 @@ public interface NamedConfiguration extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getNamedConfiguration_Name()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getNamedConfiguration_Name()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.NamedConfiguration#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/SpecializationTypeConfiguration.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
index 9bb4bc4df42..c0203534569 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/SpecializationTypeConfiguration.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/SpecializationTypeConfiguration.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations;
+package org.eclipse.papyrus.infra.types;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,13 +23,13 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getSpecializationTypeConfiguration()
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration()
  * @model
  * @generated
  */
@@ -44,7 +44,7 @@ public interface SpecializationTypeConfiguration extends ElementTypeConfiguratio
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specialized Types ID</em>' attribute list.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getSpecializationTypeConfiguration_SpecializedTypesID()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_SpecializedTypesID()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -52,7 +52,7 @@ public interface SpecializationTypeConfiguration extends ElementTypeConfiguratio
 
 	/**
 	 * Returns the value of the '<em><b>Edit Helper Advice Configuration</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Edit Helper Advice Configuration</em>' containment reference isn't clear,
@@ -61,15 +61,15 @@ public interface SpecializationTypeConfiguration extends ElementTypeConfiguratio
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Edit Helper Advice Configuration</em>' containment reference.
 	 * @see #setEditHelperAdviceConfiguration(AbstractEditHelperAdviceConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getSpecializationTypeConfiguration_EditHelperAdviceConfiguration()
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration#getTarget
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_EditHelperAdviceConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration#getTarget
 	 * @model opposite="target" containment="true"
 	 * @generated
 	 */
 	AbstractEditHelperAdviceConfiguration getEditHelperAdviceConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Edit Helper Advice Configuration</em>' containment reference.
@@ -88,14 +88,14 @@ public interface SpecializationTypeConfiguration extends ElementTypeConfiguratio
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Container Configuration</em>' containment reference.
 	 * @see #setContainerConfiguration(ContainerConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getSpecializationTypeConfiguration_ContainerConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_ContainerConfiguration()
 	 * @model containment="true"
 	 * @generated
 	 */
 	ContainerConfiguration getContainerConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getContainerConfiguration <em>Container Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Container Configuration</em>' containment reference.
@@ -114,14 +114,14 @@ public interface SpecializationTypeConfiguration extends ElementTypeConfiguratio
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Matcher Configuration</em>' containment reference.
 	 * @see #setMatcherConfiguration(AbstractMatcherConfiguration)
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#getSpecializationTypeConfiguration_MatcherConfiguration()
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#getSpecializationTypeConfiguration_MatcherConfiguration()
 	 * @model containment="true"
 	 * @generated
 	 */
 	AbstractMatcherConfiguration getMatcherConfiguration();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration#getMatcherConfiguration <em>Matcher Configuration</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Matcher Configuration</em>' containment reference.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractAdviceBindingConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
index 2e85e40c09e..ae8c40f72ff 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractAdviceBindingConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractAdviceBindingConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -20,13 +20,13 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.InheritanceKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,11 +36,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl#getInheritance <em>Inheritance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl#getInheritance <em>Inheritance</em>}</li>
  * </ul>
  *
  * @generated
@@ -132,7 +132,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION;
 	}
 
 	/**
@@ -153,7 +153,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		String oldIdentifier = identifier;
 		identifier = newIdentifier;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER, oldIdentifier, identifier));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER, oldIdentifier, identifier));
 	}
 
 	/**
@@ -167,7 +167,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 			target = (ElementTypeConfiguration)eResolveProxy(oldTarget);
 			if (target != oldTarget) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET, oldTarget, target));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET, oldTarget, target));
 			}
 		}
 		return target;
@@ -191,7 +191,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		ElementTypeConfiguration oldTarget = target;
 		target = newTarget;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET, oldTarget, target));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET, oldTarget, target));
 	}
 
 	/**
@@ -212,7 +212,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		ContainerConfiguration oldContainerConfiguration = containerConfiguration;
 		containerConfiguration = newContainerConfiguration;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, oldContainerConfiguration, newContainerConfiguration);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, oldContainerConfiguration, newContainerConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -227,14 +227,14 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		if (newContainerConfiguration != containerConfiguration) {
 			NotificationChain msgs = null;
 			if (containerConfiguration != null)
-				msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
 			if (newContainerConfiguration != null)
-				msgs = ((InternalEObject)newContainerConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newContainerConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
 			msgs = basicSetContainerConfiguration(newContainerConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, newContainerConfiguration, newContainerConfiguration));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION, newContainerConfiguration, newContainerConfiguration));
 	}
 
 	/**
@@ -255,7 +255,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		AbstractMatcherConfiguration oldMatcherConfiguration = matcherConfiguration;
 		matcherConfiguration = newMatcherConfiguration;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -270,14 +270,14 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		if (newMatcherConfiguration != matcherConfiguration) {
 			NotificationChain msgs = null;
 			if (matcherConfiguration != null)
-				msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
 			if (newMatcherConfiguration != null)
-				msgs = ((InternalEObject)newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
 			msgs = basicSetMatcherConfiguration(newMatcherConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));
 	}
 
 	/**
@@ -298,7 +298,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 		InheritanceKind oldInheritance = inheritance;
 		inheritance = newInheritance == null ? INHERITANCE_EDEFAULT : newInheritance;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE, oldInheritance, inheritance));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE, oldInheritance, inheritance));
 	}
 
 	/**
@@ -309,9 +309,9 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return basicSetContainerConfiguration(null, msgs);
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				return basicSetMatcherConfiguration(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -325,16 +325,16 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
 				return getIdentifier();
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
 				if (resolve) return getTarget();
 				return basicGetTarget();
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return getContainerConfiguration();
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				return getMatcherConfiguration();
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
 				return getInheritance();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -348,19 +348,19 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
 				setIdentifier((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
 				setTarget((ElementTypeConfiguration)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				setContainerConfiguration((ContainerConfiguration)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
 				setInheritance((InheritanceKind)newValue);
 				return;
 		}
@@ -375,19 +375,19 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
 				setIdentifier(IDENTIFIER_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
 				setTarget((ElementTypeConfiguration)null);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				setContainerConfiguration((ContainerConfiguration)null);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				setMatcherConfiguration((AbstractMatcherConfiguration)null);
 				return;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
 				setInheritance(INHERITANCE_EDEFAULT);
 				return;
 		}
@@ -402,15 +402,15 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER:
 				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET:
 				return target != null;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return containerConfiguration != null;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION:
 				return matcherConfiguration != null;
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE:
 				return inheritance != INHERITANCE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
@@ -425,7 +425,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == IdentifiedConfiguration.class) {
 			switch (derivedFeatureID) {
-				case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: return ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER;
+				case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER;
 				default: return -1;
 			}
 		}
@@ -441,7 +441,7 @@ public abstract class AbstractAdviceBindingConfigurationImpl extends AdviceConfi
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == IdentifiedConfiguration.class) {
 			switch (baseFeatureID) {
-				case ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
+				case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
 				default: return -1;
 			}
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractEditHelperAdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
index 0bb450384fa..b7ca6a5ebb7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractEditHelperAdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractEditHelperAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractEditHelperAdviceConfigurationImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AbstractEditHelperAdviceConfigurationImpl#getTarget <em>Target</em>}</li>
  * </ul>
  *
  * @generated
@@ -56,7 +56,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION;
 	}
 
 	/**
@@ -65,7 +65,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 * @generated
 	 */
 	public SpecializationTypeConfiguration getTarget() {
-		if (eContainerFeatureID() != ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET) return null;
+		if (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET) return null;
 		return (SpecializationTypeConfiguration)eInternalContainer();
 	}
 
@@ -75,7 +75,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 * @generated
 	 */
 	public NotificationChain basicSetTarget(SpecializationTypeConfiguration newTarget, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newTarget, ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, msgs);
+		msgs = eBasicSetContainer((InternalEObject)newTarget, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, msgs);
 		return msgs;
 	}
 
@@ -85,19 +85,19 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	 * @generated
 	 */
 	public void setTarget(SpecializationTypeConfiguration newTarget) {
-		if (newTarget != eInternalContainer() || (eContainerFeatureID() != ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET && newTarget != null)) {
+		if (newTarget != eInternalContainer() || (eContainerFeatureID() != ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET && newTarget != null)) {
 			if (EcoreUtil.isAncestor(this, newTarget))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newTarget != null)
-				msgs = ((InternalEObject)newTarget).eInverseAdd(this, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+				msgs = ((InternalEObject)newTarget).eInverseAdd(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
 			msgs = basicSetTarget(newTarget, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, newTarget, newTarget));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, newTarget, newTarget));
 	}
 
 	/**
@@ -108,7 +108,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				if (eInternalContainer() != null)
 					msgs = eBasicRemoveFromContainer(msgs);
 				return basicSetTarget((SpecializationTypeConfiguration)otherEnd, msgs);
@@ -124,7 +124,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				return basicSetTarget(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -138,8 +138,8 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
-				return eInternalContainer().eInverseRemove(this, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+				return eInternalContainer().eInverseRemove(this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, SpecializationTypeConfiguration.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -152,7 +152,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				return getTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -166,7 +166,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				setTarget((SpecializationTypeConfiguration)newValue);
 				return;
 		}
@@ -181,7 +181,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				setTarget((SpecializationTypeConfiguration)null);
 				return;
 		}
@@ -196,7 +196,7 @@ public abstract class AbstractEditHelperAdviceConfigurationImpl extends AdviceCo
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET:
 				return getTarget() != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractMatcherConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractMatcherConfigurationImpl.java
index 507c8f165b7..cc18910c073 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AbstractMatcherConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AbstractMatcherConfigurationImpl.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,7 +43,7 @@ public abstract class AbstractMatcherConfigurationImpl extends MinimalEObjectImp
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ABSTRACT_MATCHER_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ABSTRACT_MATCHER_CONFIGURATION;
 	}
 
 } //AbstractMatcherConfigurationImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java
index 147e3bfe083..24cada778b5 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceBindingConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceBindingConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceBindingConfigurationImpl#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AdviceBindingConfigurationImpl#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -71,7 +71,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ADVICE_BINDING_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ADVICE_BINDING_CONFIGURATION;
 	}
 
 	/**
@@ -92,7 +92,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
 		String oldEditHelperAdviceClassName = editHelperAdviceClassName;
 		editHelperAdviceClassName = newEditHelperAdviceClassName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME, oldEditHelperAdviceClassName, editHelperAdviceClassName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME, oldEditHelperAdviceClassName, editHelperAdviceClassName));
 	}
 
 	/**
@@ -103,7 +103,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				return getEditHelperAdviceClassName();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -117,7 +117,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				setEditHelperAdviceClassName((String)newValue);
 				return;
 		}
@@ -132,7 +132,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				setEditHelperAdviceClassName(EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT);
 				return;
 		}
@@ -147,7 +147,7 @@ public class AdviceBindingConfigurationImpl extends AbstractAdviceBindingConfigu
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				return EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT == null ? editHelperAdviceClassName != null : !EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT.equals(editHelperAdviceClassName);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java
index c4a14cba724..b03701761c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/AdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/AdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import java.util.Collection;
 
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,8 +31,8 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl#getBefore <em>Before</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AdviceConfigurationImpl#getAfter <em>After</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl#getBefore <em>Before</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.AdviceConfigurationImpl#getAfter <em>After</em>}</li>
  * </ul>
  *
  * @generated
@@ -74,7 +74,7 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ADVICE_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ADVICE_CONFIGURATION;
 	}
 
 	/**
@@ -84,7 +84,7 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	 */
 	public EList<String> getBefore() {
 		if (before == null) {
-			before = new EDataTypeUniqueEList<String>(String.class, this, ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE);
+			before = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE);
 		}
 		return before;
 	}
@@ -96,7 +96,7 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	 */
 	public EList<String> getAfter() {
 		if (after == null) {
-			after = new EDataTypeUniqueEList<String>(String.class, this, ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER);
+			after = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER);
 		}
 		return after;
 	}
@@ -109,9 +109,9 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
 				return getBefore();
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
 				return getAfter();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -126,11 +126,11 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
 				getBefore().clear();
 				getBefore().addAll((Collection<? extends String>)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
 				getAfter().clear();
 				getAfter().addAll((Collection<? extends String>)newValue);
 				return;
@@ -146,10 +146,10 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
 				getBefore().clear();
 				return;
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
 				getAfter().clear();
 				return;
 		}
@@ -164,9 +164,9 @@ public abstract class AdviceConfigurationImpl extends ConfigurationElementImpl i
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__BEFORE:
 				return before != null && !before.isEmpty();
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION__AFTER:
 				return after != null && !after.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfigurationElementImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
index f86d35f1ff3..e9c91d8f273 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ConfigurationElementImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ConfigurationElementImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ConfigurationElementImpl#getDescription <em>Description</em>}</li>
  * </ul>
  *
  * @generated
@@ -72,7 +72,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.CONFIGURATION_ELEMENT;
+		return ElementTypesConfigurationsPackage.Literals.CONFIGURATION_ELEMENT;
 	}
 
 	/**
@@ -93,7 +93,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 		String oldDescription = description;
 		description = newDescription;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION, oldDescription, description));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION, oldDescription, description));
 	}
 
 	/**
@@ -104,7 +104,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				return getDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -118,7 +118,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				setDescription((String)newValue);
 				return;
 		}
@@ -133,7 +133,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				setDescription(DESCRIPTION_EDEFAULT);
 				return;
 		}
@@ -148,7 +148,7 @@ public abstract class ConfigurationElementImpl extends MinimalEObjectImpl.Contai
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT__DESCRIPTION:
 				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
index 30508f1438d..a447d46c596 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ContainerConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ContainerConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import java.util.Collection;
 
@@ -28,9 +28,9 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,8 +40,8 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ContainerConfigurationImpl#getEContainmentFeatures <em>EContainment Features</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl#getContainerMatcherConfiguration <em>Container Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ContainerConfigurationImpl#getEContainmentFeatures <em>EContainment Features</em>}</li>
  * </ul>
  *
  * @generated
@@ -83,7 +83,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.CONTAINER_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION;
 	}
 
 	/**
@@ -104,7 +104,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 		AbstractMatcherConfiguration oldContainerMatcherConfiguration = containerMatcherConfiguration;
 		containerMatcherConfiguration = newContainerMatcherConfiguration;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, oldContainerMatcherConfiguration, newContainerMatcherConfiguration);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, oldContainerMatcherConfiguration, newContainerMatcherConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -119,14 +119,14 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 		if (newContainerMatcherConfiguration != containerMatcherConfiguration) {
 			NotificationChain msgs = null;
 			if (containerMatcherConfiguration != null)
-				msgs = ((InternalEObject)containerMatcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)containerMatcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, null, msgs);
 			if (newContainerMatcherConfiguration != null)
-				msgs = ((InternalEObject)newContainerMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newContainerMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, null, msgs);
 			msgs = basicSetContainerMatcherConfiguration(newContainerMatcherConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, newContainerMatcherConfiguration, newContainerMatcherConfiguration));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION, newContainerMatcherConfiguration, newContainerMatcherConfiguration));
 	}
 
 	/**
@@ -136,7 +136,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	 */
 	public EList<EReference> getEContainmentFeatures() {
 		if (eContainmentFeatures == null) {
-			eContainmentFeatures = new EObjectResolvingEList<EReference>(EReference.class, this, ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES);
+			eContainmentFeatures = new EObjectResolvingEList<EReference>(EReference.class, this, ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES);
 		}
 		return eContainmentFeatures;
 	}
@@ -149,7 +149,7 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				return basicSetContainerMatcherConfiguration(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -163,9 +163,9 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				return getContainerMatcherConfiguration();
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				return getEContainmentFeatures();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -180,10 +180,10 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				setContainerMatcherConfiguration((AbstractMatcherConfiguration)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				getEContainmentFeatures().clear();
 				getEContainmentFeatures().addAll((Collection<? extends EReference>)newValue);
 				return;
@@ -199,10 +199,10 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				setContainerMatcherConfiguration((AbstractMatcherConfiguration)null);
 				return;
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				getEContainmentFeatures().clear();
 				return;
 		}
@@ -217,9 +217,9 @@ public class ContainerConfigurationImpl extends MinimalEObjectImpl.Container imp
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION:
 				return containerMatcherConfiguration != null;
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION__ECONTAINMENT_FEATURES:
 				return eContainmentFeatures != null && !eContainmentFeatures.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java
index 44accd06c92..959c2bbda4d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/EditHelperAdviceConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/EditHelperAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.EditHelperAdviceConfigurationImpl#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.EditHelperAdviceConfigurationImpl#getEditHelperAdviceClassName <em>Edit Helper Advice Class Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -71,7 +71,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.EDIT_HELPER_ADVICE_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.EDIT_HELPER_ADVICE_CONFIGURATION;
 	}
 
 	/**
@@ -92,7 +92,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
 		String oldEditHelperAdviceClassName = editHelperAdviceClassName;
 		editHelperAdviceClassName = newEditHelperAdviceClassName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME, oldEditHelperAdviceClassName, editHelperAdviceClassName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME, oldEditHelperAdviceClassName, editHelperAdviceClassName));
 	}
 
 	/**
@@ -103,7 +103,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				return getEditHelperAdviceClassName();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -117,7 +117,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				setEditHelperAdviceClassName((String)newValue);
 				return;
 		}
@@ -132,7 +132,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				setEditHelperAdviceClassName(EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT);
 				return;
 		}
@@ -147,7 +147,7 @@ public class EditHelperAdviceConfigurationImpl extends AbstractEditHelperAdviceC
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION__EDIT_HELPER_ADVICE_CLASS_NAME:
 				return EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT == null ? editHelperAdviceClassName != null : !EDIT_HELPER_ADVICE_CLASS_NAME_EDEFAULT.equals(editHelperAdviceClassName);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
index 053bd7e13d6..447a47cb352 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IconEntry;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.NamedConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,11 +34,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeConfigurationImpl#getIconEntry <em>Icon Entry</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getHint <em>Hint</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeConfigurationImpl#getIconEntry <em>Icon Entry</em>}</li>
  * </ul>
  *
  * @generated
@@ -150,7 +150,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION;
 	}
 
 	/**
@@ -171,7 +171,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 		String oldIdentifier = identifier;
 		identifier = newIdentifier;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER, oldIdentifier, identifier));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER, oldIdentifier, identifier));
 	}
 
 	/**
@@ -192,7 +192,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME, oldName, name));
 	}
 
 	/**
@@ -213,7 +213,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 		String oldHint = hint;
 		hint = newHint;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT, oldHint, hint));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT, oldHint, hint));
 	}
 
 	/**
@@ -234,7 +234,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 		String oldKind = kind;
 		kind = newKind;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND, oldKind, kind));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND, oldKind, kind));
 	}
 
 	/**
@@ -255,7 +255,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 		IconEntry oldIconEntry = iconEntry;
 		iconEntry = newIconEntry;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, oldIconEntry, newIconEntry);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, oldIconEntry, newIconEntry);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -270,14 +270,14 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 		if (newIconEntry != iconEntry) {
 			NotificationChain msgs = null;
 			if (iconEntry != null)
-				msgs = ((InternalEObject)iconEntry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, null, msgs);
+				msgs = ((InternalEObject)iconEntry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, null, msgs);
 			if (newIconEntry != null)
-				msgs = ((InternalEObject)newIconEntry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, null, msgs);
+				msgs = ((InternalEObject)newIconEntry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, null, msgs);
 			msgs = basicSetIconEntry(newIconEntry, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, newIconEntry, newIconEntry));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY, newIconEntry, newIconEntry));
 	}
 
 	/**
@@ -288,7 +288,7 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				return basicSetIconEntry(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -302,15 +302,15 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
 				return getIdentifier();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				return getName();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				return getHint();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
 				return getKind();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				return getIconEntry();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -324,19 +324,19 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
 				setIdentifier((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				setName((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				setHint((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
 				setKind((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				setIconEntry((IconEntry)newValue);
 				return;
 		}
@@ -351,19 +351,19 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
 				setIdentifier(IDENTIFIER_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				setHint(HINT_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
 				setKind(KIND_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				setIconEntry((IconEntry)null);
 				return;
 		}
@@ -378,15 +378,15 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER:
 				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__HINT:
 				return HINT_EDEFAULT == null ? hint != null : !HINT_EDEFAULT.equals(hint);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__KIND:
 				return KIND_EDEFAULT == null ? kind != null : !KIND_EDEFAULT.equals(kind);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__ICON_ENTRY:
 				return iconEntry != null;
 		}
 		return super.eIsSet(featureID);
@@ -401,13 +401,13 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == IdentifiedConfiguration.class) {
 			switch (derivedFeatureID) {
-				case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER: return ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER;
+				case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER;
 				default: return -1;
 			}
 		}
 		if (baseClass == NamedConfiguration.class) {
 			switch (derivedFeatureID) {
-				case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME: return ElementtypesconfigurationsPackage.NAMED_CONFIGURATION__NAME;
+				case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME: return ElementTypesConfigurationsPackage.NAMED_CONFIGURATION__NAME;
 				default: return -1;
 			}
 		}
@@ -423,13 +423,13 @@ public abstract class ElementTypeConfigurationImpl extends ConfigurationElementI
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == IdentifiedConfiguration.class) {
 			switch (baseFeatureID) {
-				case ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;
+				case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__IDENTIFIER;
 				default: return -1;
 			}
 		}
 		if (baseClass == NamedConfiguration.class) {
 			switch (baseFeatureID) {
-				case ElementtypesconfigurationsPackage.NAMED_CONFIGURATION__NAME: return ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME;
+				case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION__NAME: return ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION__NAME;
 				default: return -1;
 			}
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
index 5052d34ecab..e358bb7f1ed 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementTypeSetConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypeSetConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import java.util.Collection;
 
@@ -27,12 +27,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.NamedConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -42,11 +42,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getElementTypeConfigurations <em>Element Type Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getAdviceBindingsConfigurations <em>Advice Bindings Configurations</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl#getMetamodelNsURI <em>Metamodel Ns URI</em>}</li>
  * </ul>
  *
  * @generated
@@ -148,7 +148,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION;
 	}
 
 	/**
@@ -169,7 +169,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 		String oldIdentifier = identifier;
 		identifier = newIdentifier;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER, oldIdentifier, identifier));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER, oldIdentifier, identifier));
 	}
 
 	/**
@@ -190,7 +190,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME, oldName, name));
 	}
 
 	/**
@@ -200,7 +200,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	 */
 	public EList<ElementTypeConfiguration> getElementTypeConfigurations() {
 		if (elementTypeConfigurations == null) {
-			elementTypeConfigurations = new EObjectContainmentEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
+			elementTypeConfigurations = new EObjectContainmentEList<ElementTypeConfiguration>(ElementTypeConfiguration.class, this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS);
 		}
 		return elementTypeConfigurations;
 	}
@@ -212,7 +212,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	 */
 	public EList<AbstractAdviceBindingConfiguration> getAdviceBindingsConfigurations() {
 		if (adviceBindingsConfigurations == null) {
-			adviceBindingsConfigurations = new EObjectContainmentEList<AbstractAdviceBindingConfiguration>(AbstractAdviceBindingConfiguration.class, this, ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
+			adviceBindingsConfigurations = new EObjectContainmentEList<AbstractAdviceBindingConfiguration>(AbstractAdviceBindingConfiguration.class, this, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS);
 		}
 		return adviceBindingsConfigurations;
 	}
@@ -235,7 +235,7 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 		String oldMetamodelNsURI = metamodelNsURI;
 		metamodelNsURI = newMetamodelNsURI;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI, oldMetamodelNsURI, metamodelNsURI));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI, oldMetamodelNsURI, metamodelNsURI));
 	}
 
 	/**
@@ -246,9 +246,9 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 				return ((InternalEList<?>)getElementTypeConfigurations()).basicRemove(otherEnd, msgs);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return ((InternalEList<?>)getAdviceBindingsConfigurations()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -262,15 +262,15 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
 				return getIdentifier();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				return getName();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 				return getElementTypeConfigurations();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return getAdviceBindingsConfigurations();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				return getMetamodelNsURI();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -285,21 +285,21 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
 				setIdentifier((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				setName((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 				getElementTypeConfigurations().clear();
 				getElementTypeConfigurations().addAll((Collection<? extends ElementTypeConfiguration>)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				getAdviceBindingsConfigurations().clear();
 				getAdviceBindingsConfigurations().addAll((Collection<? extends AbstractAdviceBindingConfiguration>)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				setMetamodelNsURI((String)newValue);
 				return;
 		}
@@ -314,19 +314,19 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
 				setIdentifier(IDENTIFIER_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				setName(NAME_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 				getElementTypeConfigurations().clear();
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				getAdviceBindingsConfigurations().clear();
 				return;
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				setMetamodelNsURI(METAMODEL_NS_URI_EDEFAULT);
 				return;
 		}
@@ -341,15 +341,15 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER:
 				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ELEMENT_TYPE_CONFIGURATIONS:
 				return elementTypeConfigurations != null && !elementTypeConfigurations.isEmpty();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS:
 				return adviceBindingsConfigurations != null && !adviceBindingsConfigurations.isEmpty();
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__METAMODEL_NS_URI:
 				return METAMODEL_NS_URI_EDEFAULT == null ? metamodelNsURI != null : !METAMODEL_NS_URI_EDEFAULT.equals(metamodelNsURI);
 		}
 		return super.eIsSet(featureID);
@@ -364,13 +364,13 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
 		if (baseClass == IdentifiedConfiguration.class) {
 			switch (derivedFeatureID) {
-				case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER: return ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER;
+				case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER;
 				default: return -1;
 			}
 		}
 		if (baseClass == NamedConfiguration.class) {
 			switch (derivedFeatureID) {
-				case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME: return ElementtypesconfigurationsPackage.NAMED_CONFIGURATION__NAME;
+				case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME: return ElementTypesConfigurationsPackage.NAMED_CONFIGURATION__NAME;
 				default: return -1;
 			}
 		}
@@ -386,13 +386,13 @@ public class ElementTypeSetConfigurationImpl extends ConfigurationElementImpl im
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
 		if (baseClass == IdentifiedConfiguration.class) {
 			switch (baseFeatureID) {
-				case ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER;
+				case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION__IDENTIFIER: return ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__IDENTIFIER;
 				default: return -1;
 			}
 		}
 		if (baseClass == NamedConfiguration.class) {
 			switch (baseFeatureID) {
-				case ElementtypesconfigurationsPackage.NAMED_CONFIGURATION__NAME: return ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME;
+				case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION__NAME: return ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION__NAME;
 				default: return -1;
 			}
 		}
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java
index cc95ebb135b..81814b16b0f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsFactoryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.*;
+import org.eclipse.papyrus.infra.types.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,24 +29,24 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.*;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implements ElementtypesconfigurationsFactory {
+public class ElementTypesConfigurationsFactoryImpl extends EFactoryImpl implements ElementTypesConfigurationsFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static ElementtypesconfigurationsFactory init() {
+	public static ElementTypesConfigurationsFactory init() {
 		try {
-			ElementtypesconfigurationsFactory theElementtypesconfigurationsFactory = (ElementtypesconfigurationsFactory)EPackage.Registry.INSTANCE.getEFactory(ElementtypesconfigurationsPackage.eNS_URI);
-			if (theElementtypesconfigurationsFactory != null) {
-				return theElementtypesconfigurationsFactory;
+			ElementTypesConfigurationsFactory theElementTypesConfigurationsFactory = (ElementTypesConfigurationsFactory)EPackage.Registry.INSTANCE.getEFactory(ElementTypesConfigurationsPackage.eNS_URI);
+			if (theElementTypesConfigurationsFactory != null) {
+				return theElementTypesConfigurationsFactory;
 			}
 		}
 		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new ElementtypesconfigurationsFactoryImpl();
+		return new ElementTypesConfigurationsFactoryImpl();
 	}
 
 	/**
@@ -55,7 +55,7 @@ public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsFactoryImpl() {
+	public ElementTypesConfigurationsFactoryImpl() {
 		super();
 	}
 
@@ -67,14 +67,14 @@ public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implemen
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION: return createElementTypeSetConfiguration();
-			case ElementtypesconfigurationsPackage.ICON_ENTRY: return createIconEntry();
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION: return createSpecializationTypeConfiguration();
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION: return createContainerConfiguration();
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: return createMetamodelTypeConfiguration();
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION: return createEditHelperAdviceConfiguration();
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION: return createAdviceBindingConfiguration();
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION: return createMatcherConfiguration();
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION: return createElementTypeSetConfiguration();
+			case ElementTypesConfigurationsPackage.ICON_ENTRY: return createIconEntry();
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION: return createSpecializationTypeConfiguration();
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION: return createContainerConfiguration();
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: return createMetamodelTypeConfiguration();
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION: return createEditHelperAdviceConfiguration();
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION: return createAdviceBindingConfiguration();
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION: return createMatcherConfiguration();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -88,7 +88,7 @@ public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implemen
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case ElementtypesconfigurationsPackage.INHERITANCE_KIND:
+			case ElementTypesConfigurationsPackage.INHERITANCE_KIND:
 				return createInheritanceKindFromString(eDataType, initialValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
@@ -103,7 +103,7 @@ public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implemen
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case ElementtypesconfigurationsPackage.INHERITANCE_KIND:
+			case ElementTypesConfigurationsPackage.INHERITANCE_KIND:
 				return convertInheritanceKindToString(eDataType, instanceValue);
 			default:
 				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
@@ -215,8 +215,8 @@ public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsPackage getElementtypesconfigurationsPackage() {
-		return (ElementtypesconfigurationsPackage)getEPackage();
+	public ElementTypesConfigurationsPackage getElementTypesConfigurationsPackage() {
+		return (ElementTypesConfigurationsPackage)getEPackage();
 	}
 
 	/**
@@ -226,8 +226,8 @@ public class ElementtypesconfigurationsFactoryImpl extends EFactoryImpl implemen
 	 * @generated
 	 */
 	@Deprecated
-	public static ElementtypesconfigurationsPackage getPackage() {
-		return ElementtypesconfigurationsPackage.eINSTANCE;
+	public static ElementTypesConfigurationsPackage getPackage() {
+		return ElementTypesConfigurationsPackage.eINSTANCE;
 	}
 
-} //ElementtypesconfigurationsFactoryImpl
+} //ElementTypesConfigurationsFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
index 9a63d44932f..98f75ed6fb8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/ElementtypesconfigurationsPackageImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/ElementTypesConfigurationsPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,25 +20,25 @@ import org.eclipse.emf.ecore.EReference;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.InheritanceKind;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IconEntry;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.InheritanceKind;
+import org.eclipse.papyrus.infra.types.MatcherConfiguration;
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.NamedConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -46,7 +46,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
  * <!-- end-user-doc -->
  * @generated
  */
-public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implements ElementtypesconfigurationsPackage {
+public class ElementTypesConfigurationsPackageImpl extends EPackageImpl implements ElementTypesConfigurationsPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -177,12 +177,12 @@ public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implemen
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage#eNS_URI
+	 * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private ElementtypesconfigurationsPackageImpl() {
-		super(eNS_URI, ElementtypesconfigurationsFactory.eINSTANCE);
+	private ElementTypesConfigurationsPackageImpl() {
+		super(eNS_URI, ElementTypesConfigurationsFactory.eINSTANCE);
 	}
 
 	/**
@@ -195,7 +195,7 @@ public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implemen
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link ElementtypesconfigurationsPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link ElementTypesConfigurationsPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -204,27 +204,27 @@ public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implemen
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static ElementtypesconfigurationsPackage init() {
-		if (isInited) return (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);
+	public static ElementTypesConfigurationsPackage init() {
+		if (isInited) return (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
 
 		// Obtain or create and register package
-		ElementtypesconfigurationsPackageImpl theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementtypesconfigurationsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementtypesconfigurationsPackageImpl());
+		ElementTypesConfigurationsPackageImpl theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementTypesConfigurationsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementTypesConfigurationsPackageImpl());
 
 		isInited = true;
 
 		// Create package meta-data objects
-		theElementtypesconfigurationsPackage.createPackageContents();
+		theElementTypesConfigurationsPackage.createPackageContents();
 
 		// Initialize created meta-data
-		theElementtypesconfigurationsPackage.initializePackageContents();
+		theElementTypesConfigurationsPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		theElementtypesconfigurationsPackage.freeze();
+		theElementTypesConfigurationsPackage.freeze();
 
   
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ElementtypesconfigurationsPackage.eNS_URI, theElementtypesconfigurationsPackage);
-		return theElementtypesconfigurationsPackage;
+		EPackage.Registry.INSTANCE.put(ElementTypesConfigurationsPackage.eNS_URI, theElementTypesConfigurationsPackage);
+		return theElementTypesConfigurationsPackage;
 	}
 
 	/**
@@ -646,8 +646,8 @@ public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsFactory getElementtypesconfigurationsFactory() {
-		return (ElementtypesconfigurationsFactory)getEFactoryInstance();
+	public ElementTypesConfigurationsFactory getElementTypesConfigurationsFactory() {
+		return (ElementTypesConfigurationsFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -849,4 +849,4 @@ public class ElementtypesconfigurationsPackageImpl extends EPackageImpl implemen
 		createResource(eNS_URI);
 	}
 
-} //ElementtypesconfigurationsPackageImpl
+} //ElementTypesConfigurationsPackageImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/IconEntryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java
index aa7cea95b1c..67572526283 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/IconEntryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/IconEntryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IconEntry;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,8 +30,8 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.IconEntryImpl#getIconPath <em>Icon Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.IconEntryImpl#getBundleId <em>Bundle Id</em>}</li>
  * </ul>
  *
  * @generated
@@ -93,7 +93,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.ICON_ENTRY;
+		return ElementTypesConfigurationsPackage.Literals.ICON_ENTRY;
 	}
 
 	/**
@@ -114,7 +114,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 		String oldIconPath = iconPath;
 		iconPath = newIconPath;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ICON_ENTRY__ICON_PATH, oldIconPath, iconPath));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ICON_ENTRY__ICON_PATH, oldIconPath, iconPath));
 	}
 
 	/**
@@ -135,7 +135,7 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 		String oldBundleId = bundleId;
 		bundleId = newBundleId;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.ICON_ENTRY__BUNDLE_ID, oldBundleId, bundleId));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.ICON_ENTRY__BUNDLE_ID, oldBundleId, bundleId));
 	}
 
 	/**
@@ -146,9 +146,9 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__ICON_PATH:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__ICON_PATH:
 				return getIconPath();
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
 				return getBundleId();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -162,10 +162,10 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__ICON_PATH:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__ICON_PATH:
 				setIconPath((String)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
 				setBundleId((String)newValue);
 				return;
 		}
@@ -180,10 +180,10 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__ICON_PATH:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__ICON_PATH:
 				setIconPath(ICON_PATH_EDEFAULT);
 				return;
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
 				setBundleId(BUNDLE_ID_EDEFAULT);
 				return;
 		}
@@ -198,9 +198,9 @@ public class IconEntryImpl extends MinimalEObjectImpl.Container implements IconE
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__ICON_PATH:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__ICON_PATH:
 				return ICON_PATH_EDEFAULT == null ? iconPath != null : !ICON_PATH_EDEFAULT.equals(iconPath);
-			case ElementtypesconfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
+			case ElementTypesConfigurationsPackage.ICON_ENTRY__BUNDLE_ID:
 				return BUNDLE_ID_EDEFAULT == null ? bundleId != null : !BUNDLE_ID_EDEFAULT.equals(bundleId);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MatcherConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java
index 45b1deef37d..78becef0f99 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MatcherConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MatcherConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.MatcherConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MatcherConfigurationImpl#getMatcherClassName <em>Matcher Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.MatcherConfigurationImpl#getMatcherClassName <em>Matcher Class Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -71,7 +71,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.MATCHER_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.MATCHER_CONFIGURATION;
 	}
 
 	/**
@@ -92,7 +92,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
 		String oldMatcherClassName = matcherClassName;
 		matcherClassName = newMatcherClassName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME, oldMatcherClassName, matcherClassName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME, oldMatcherClassName, matcherClassName));
 	}
 
 	/**
@@ -103,7 +103,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
 				return getMatcherClassName();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -117,7 +117,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
 				setMatcherClassName((String)newValue);
 				return;
 		}
@@ -132,7 +132,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
 				setMatcherClassName(MATCHER_CLASS_NAME_EDEFAULT);
 				return;
 		}
@@ -147,7 +147,7 @@ public class MatcherConfigurationImpl extends AbstractMatcherConfigurationImpl i
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION__MATCHER_CLASS_NAME:
 				return MATCHER_CLASS_NAME_EDEFAULT == null ? matcherClassName != null : !MATCHER_CLASS_NAME_EDEFAULT.equals(matcherClassName);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MetamodelTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java
index 56f9707dfb1..002474183ea 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/MetamodelTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/MetamodelTypeConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -19,8 +19,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,8 +30,8 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfigu
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl#getEClass <em>EClass</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.MetamodelTypeConfigurationImpl#getEditHelperClassName <em>Edit Helper Class Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl#getEClass <em>EClass</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.MetamodelTypeConfigurationImpl#getEditHelperClassName <em>Edit Helper Class Name</em>}</li>
  * </ul>
  *
  * @generated
@@ -83,7 +83,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.METAMODEL_TYPE_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.METAMODEL_TYPE_CONFIGURATION;
 	}
 
 	/**
@@ -97,7 +97,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 			eClass = (EClass)eResolveProxy(oldEClass);
 			if (eClass != oldEClass) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS, oldEClass, eClass));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS, oldEClass, eClass));
 			}
 		}
 		return eClass;
@@ -121,7 +121,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 		EClass oldEClass = eClass;
 		eClass = newEClass;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS, oldEClass, eClass));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS, oldEClass, eClass));
 	}
 
 	/**
@@ -142,7 +142,7 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 		String oldEditHelperClassName = editHelperClassName;
 		editHelperClassName = newEditHelperClassName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME, oldEditHelperClassName, editHelperClassName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME, oldEditHelperClassName, editHelperClassName));
 	}
 
 	/**
@@ -153,10 +153,10 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
 				if (resolve) return getEClass();
 				return basicGetEClass();
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
 				return getEditHelperClassName();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -170,10 +170,10 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
 				setEClass((EClass)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
 				setEditHelperClassName((String)newValue);
 				return;
 		}
@@ -188,10 +188,10 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
 				setEClass((EClass)null);
 				return;
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
 				setEditHelperClassName(EDIT_HELPER_CLASS_NAME_EDEFAULT);
 				return;
 		}
@@ -206,9 +206,9 @@ public class MetamodelTypeConfigurationImpl extends ElementTypeConfigurationImpl
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__ECLASS:
 				return eClass != null;
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION__EDIT_HELPER_CLASS_NAME:
 				return EDIT_HELPER_CLASS_NAME_EDEFAULT == null ? editHelperClassName != null : !EDIT_HELPER_CLASS_NAME_EDEFAULT.equals(editHelperClassName);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
index 509a2eb209e..f460c2960ef 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/impl/SpecializationTypeConfigurationImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/impl/SpecializationTypeConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.impl;
+package org.eclipse.papyrus.infra.types.impl;
 
 import java.util.Collection;
 
@@ -26,11 +26,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,10 +40,10 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeCo
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.impl.SpecializationTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getSpecializedTypesID <em>Specialized Types ID</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getEditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getContainerConfiguration <em>Container Configuration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.infra.types.impl.SpecializationTypeConfigurationImpl#getMatcherConfiguration <em>Matcher Configuration</em>}</li>
  * </ul>
  *
  * @generated
@@ -105,7 +105,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION;
+		return ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION;
 	}
 
 	/**
@@ -115,7 +115,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	 */
 	public EList<String> getSpecializedTypesID() {
 		if (specializedTypesID == null) {
-			specializedTypesID = new EDataTypeUniqueEList<String>(String.class, this, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
+			specializedTypesID = new EDataTypeUniqueEList<String>(String.class, this, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID);
 		}
 		return specializedTypesID;
 	}
@@ -138,7 +138,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		AbstractEditHelperAdviceConfiguration oldEditHelperAdviceConfiguration = editHelperAdviceConfiguration;
 		editHelperAdviceConfiguration = newEditHelperAdviceConfiguration;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, oldEditHelperAdviceConfiguration, newEditHelperAdviceConfiguration);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, oldEditHelperAdviceConfiguration, newEditHelperAdviceConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -153,14 +153,14 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		if (newEditHelperAdviceConfiguration != editHelperAdviceConfiguration) {
 			NotificationChain msgs = null;
 			if (editHelperAdviceConfiguration != null)
-				msgs = ((InternalEObject)editHelperAdviceConfiguration).eInverseRemove(this, ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, AbstractEditHelperAdviceConfiguration.class, msgs);
+				msgs = ((InternalEObject)editHelperAdviceConfiguration).eInverseRemove(this, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, AbstractEditHelperAdviceConfiguration.class, msgs);
 			if (newEditHelperAdviceConfiguration != null)
-				msgs = ((InternalEObject)newEditHelperAdviceConfiguration).eInverseAdd(this, ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, AbstractEditHelperAdviceConfiguration.class, msgs);
+				msgs = ((InternalEObject)newEditHelperAdviceConfiguration).eInverseAdd(this, ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION__TARGET, AbstractEditHelperAdviceConfiguration.class, msgs);
 			msgs = basicSetEditHelperAdviceConfiguration(newEditHelperAdviceConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, newEditHelperAdviceConfiguration, newEditHelperAdviceConfiguration));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, newEditHelperAdviceConfiguration, newEditHelperAdviceConfiguration));
 	}
 
 	/**
@@ -181,7 +181,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		ContainerConfiguration oldContainerConfiguration = containerConfiguration;
 		containerConfiguration = newContainerConfiguration;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, oldContainerConfiguration, newContainerConfiguration);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, oldContainerConfiguration, newContainerConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -196,14 +196,14 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		if (newContainerConfiguration != containerConfiguration) {
 			NotificationChain msgs = null;
 			if (containerConfiguration != null)
-				msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)containerConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
 			if (newContainerConfiguration != null)
-				msgs = ((InternalEObject)newContainerConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newContainerConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, null, msgs);
 			msgs = basicSetContainerConfiguration(newContainerConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, newContainerConfiguration, newContainerConfiguration));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION, newContainerConfiguration, newContainerConfiguration));
 	}
 
 	/**
@@ -224,7 +224,7 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		AbstractMatcherConfiguration oldMatcherConfiguration = matcherConfiguration;
 		matcherConfiguration = newMatcherConfiguration;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, oldMatcherConfiguration, newMatcherConfiguration);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -239,14 +239,14 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 		if (newMatcherConfiguration != matcherConfiguration) {
 			NotificationChain msgs = null;
 			if (matcherConfiguration != null)
-				msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)matcherConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
 			if (newMatcherConfiguration != null)
-				msgs = ((InternalEObject)newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
+				msgs = ((InternalEObject)newMatcherConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, null, msgs);
 			msgs = basicSetMatcherConfiguration(newMatcherConfiguration, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));
+			eNotify(new ENotificationImpl(this, Notification.SET, ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION, newMatcherConfiguration, newMatcherConfiguration));
 	}
 
 	/**
@@ -257,9 +257,9 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				if (editHelperAdviceConfiguration != null)
-					msgs = ((InternalEObject)editHelperAdviceConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, null, msgs);
+					msgs = ((InternalEObject)editHelperAdviceConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION, null, msgs);
 				return basicSetEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -273,11 +273,11 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				return basicSetEditHelperAdviceConfiguration(null, msgs);
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return basicSetContainerConfiguration(null, msgs);
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
 				return basicSetMatcherConfiguration(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -291,13 +291,13 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
 				return getSpecializedTypesID();
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				return getEditHelperAdviceConfiguration();
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return getContainerConfiguration();
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
 				return getMatcherConfiguration();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -312,17 +312,17 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
 				getSpecializedTypesID().clear();
 				getSpecializedTypesID().addAll((Collection<? extends String>)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				setEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				setContainerConfiguration((ContainerConfiguration)newValue);
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
 				setMatcherConfiguration((AbstractMatcherConfiguration)newValue);
 				return;
 		}
@@ -337,16 +337,16 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
 				getSpecializedTypesID().clear();
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				setEditHelperAdviceConfiguration((AbstractEditHelperAdviceConfiguration)null);
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				setContainerConfiguration((ContainerConfiguration)null);
 				return;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
 				setMatcherConfiguration((AbstractMatcherConfiguration)null);
 				return;
 		}
@@ -361,13 +361,13 @@ public class SpecializationTypeConfigurationImpl extends ElementTypeConfiguratio
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__SPECIALIZED_TYPES_ID:
 				return specializedTypesID != null && !specializedTypesID.isEmpty();
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__EDIT_HELPER_ADVICE_CONFIGURATION:
 				return editHelperAdviceConfiguration != null;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__CONTAINER_CONFIGURATION:
 				return containerConfiguration != null;
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION:
 				return matcherConfiguration != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsAdapterFactory.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java
index fb061dc40b8..dd857a159c4 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsAdapterFactory.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.util;
+package org.eclipse.papyrus.infra.types.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,24 +19,24 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.*;
+import org.eclipse.papyrus.infra.types.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage
  * @generated
  */
-public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl {
+public class ElementTypesConfigurationsAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static ElementtypesconfigurationsPackage modelPackage;
+	protected static ElementTypesConfigurationsPackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -44,9 +44,9 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsAdapterFactory() {
+	public ElementTypesConfigurationsAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = ElementtypesconfigurationsPackage.eINSTANCE;
+			modelPackage = ElementTypesConfigurationsPackage.eINSTANCE;
 		}
 	}
 
@@ -75,8 +75,8 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ElementtypesconfigurationsSwitch<Adapter> modelSwitch =
-		new ElementtypesconfigurationsSwitch<Adapter>() {
+	protected ElementTypesConfigurationsSwitch<Adapter> modelSwitch =
+		new ElementTypesConfigurationsSwitch<Adapter>() {
 			@Override
 			public Adapter caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
 				return createElementTypeSetConfigurationAdapter();
@@ -162,13 +162,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration <em>Element Type Set Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration <em>Element Type Set Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration
 	 * @generated
 	 */
 	public Adapter createElementTypeSetConfigurationAdapter() {
@@ -176,13 +176,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ElementTypeConfiguration <em>Element Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 	 * @generated
 	 */
 	public Adapter createElementTypeConfigurationAdapter() {
@@ -190,13 +190,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry <em>Icon Entry</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IconEntry <em>Icon Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry
+	 * @see org.eclipse.papyrus.infra.types.IconEntry
 	 * @generated
 	 */
 	public Adapter createIconEntryAdapter() {
@@ -204,13 +204,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	public Adapter createConfigurationElementAdapter() {
@@ -218,13 +218,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration <em>Abstract Matcher Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration <em>Abstract Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractMatcherConfigurationAdapter() {
@@ -232,13 +232,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration <em>Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration <em>Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createAdviceConfigurationAdapter() {
@@ -246,13 +246,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractAdviceBindingConfigurationAdapter() {
@@ -260,13 +260,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration <em>Specialization Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration
 	 * @generated
 	 */
 	public Adapter createSpecializationTypeConfigurationAdapter() {
@@ -274,13 +274,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration <em>Container Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ContainerConfiguration <em>Container Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration
+	 * @see org.eclipse.papyrus.infra.types.ContainerConfiguration
 	 * @generated
 	 */
 	public Adapter createContainerConfigurationAdapter() {
@@ -288,13 +288,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration <em>Metamodel Type Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration <em>Metamodel Type Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration
+	 * @see org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration
 	 * @generated
 	 */
 	public Adapter createMetamodelTypeConfigurationAdapter() {
@@ -302,13 +302,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration <em>Abstract Edit Helper Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration <em>Abstract Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractEditHelperAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractEditHelperAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractEditHelperAdviceConfigurationAdapter() {
@@ -316,13 +316,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration <em>Edit Helper Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.EditHelperAdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.EditHelperAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createEditHelperAdviceConfigurationAdapter() {
@@ -330,13 +330,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration <em>Advice Binding Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AdviceBindingConfiguration <em>Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceBindingConfiguration
 	 * @generated
 	 */
 	public Adapter createAdviceBindingConfigurationAdapter() {
@@ -344,13 +344,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration <em>Matcher Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.MatcherConfiguration <em>Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.MatcherConfiguration
+	 * @see org.eclipse.papyrus.infra.types.MatcherConfiguration
 	 * @generated
 	 */
 	public Adapter createMatcherConfigurationAdapter() {
@@ -358,13 +358,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	public Adapter createIdentifiedConfigurationAdapter() {
@@ -372,13 +372,13 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration <em>Named Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.NamedConfiguration <em>Named Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.NamedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.NamedConfiguration
 	 * @generated
 	 */
 	public Adapter createNamedConfigurationAdapter() {
@@ -397,4 +397,4 @@ public class ElementtypesconfigurationsAdapterFactory extends AdapterFactoryImpl
 		return null;
 	}
 
-} //ElementtypesconfigurationsAdapterFactory
+} //ElementTypesConfigurationsAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsResourceFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsResourceFactoryImpl.java
index 5c62811f637..6d6ec5d6e3f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsResourceFactoryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.util;
+package org.eclipse.papyrus.infra.types.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,17 +22,17 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceImpl
+ * @see org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceImpl
  * @generated
  */
-public class ElementtypesconfigurationsResourceFactoryImpl extends ResourceFactoryImpl {
+public class ElementTypesConfigurationsResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsResourceFactoryImpl() {
+	public ElementTypesConfigurationsResourceFactoryImpl() {
 		super();
 	}
 
@@ -44,8 +44,8 @@ public class ElementtypesconfigurationsResourceFactoryImpl extends ResourceFacto
 	 */
 	@Override
 	public Resource createResource(URI uri) {
-		Resource result = new ElementtypesconfigurationsResourceImpl(uri);
+		Resource result = new ElementTypesConfigurationsResourceImpl(uri);
 		return result;
 	}
 
-} //ElementtypesconfigurationsResourceFactoryImpl
+} //ElementTypesConfigurationsResourceFactoryImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsResourceImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsResourceImpl.java
index 2b6fa588b26..7bf8d497b95 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsResourceImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.util;
+package org.eclipse.papyrus.infra.types.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceFactoryImpl
  * @generated
  */
-public class ElementtypesconfigurationsResourceImpl extends XMIResourceImpl {
+public class ElementTypesConfigurationsResourceImpl extends XMIResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
@@ -31,8 +31,8 @@ public class ElementtypesconfigurationsResourceImpl extends XMIResourceImpl {
 	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
-	public ElementtypesconfigurationsResourceImpl(URI uri) {
+	public ElementTypesConfigurationsResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //ElementtypesconfigurationsResourceImpl
+} //ElementTypesConfigurationsResourceImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsSwitch.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java
index 74edf0afdc4..479ec3bd9d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/util/ElementtypesconfigurationsSwitch.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src-gen/org/eclipse/papyrus/infra/types/util/ElementTypesConfigurationsSwitch.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.util;
+package org.eclipse.papyrus.infra.types.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.*;
+import org.eclipse.papyrus.infra.types.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,17 +29,17 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage
+ * @see org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage
  * @generated
  */
-public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
+public class ElementTypesConfigurationsSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static ElementtypesconfigurationsPackage modelPackage;
+	protected static ElementTypesConfigurationsPackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -47,9 +47,9 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ElementtypesconfigurationsSwitch() {
+	public ElementTypesConfigurationsSwitch() {
 		if (modelPackage == null) {
-			modelPackage = ElementtypesconfigurationsPackage.eINSTANCE;
+			modelPackage = ElementTypesConfigurationsPackage.eINSTANCE;
 		}
 	}
 
@@ -76,7 +76,7 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_SET_CONFIGURATION: {
 				ElementTypeSetConfiguration elementTypeSetConfiguration = (ElementTypeSetConfiguration)theEObject;
 				T result = caseElementTypeSetConfiguration(elementTypeSetConfiguration);
 				if (result == null) result = caseConfigurationElement(elementTypeSetConfiguration);
@@ -85,7 +85,7 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ELEMENT_TYPE_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ELEMENT_TYPE_CONFIGURATION: {
 				ElementTypeConfiguration elementTypeConfiguration = (ElementTypeConfiguration)theEObject;
 				T result = caseElementTypeConfiguration(elementTypeConfiguration);
 				if (result == null) result = caseConfigurationElement(elementTypeConfiguration);
@@ -94,32 +94,32 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ICON_ENTRY: {
+			case ElementTypesConfigurationsPackage.ICON_ENTRY: {
 				IconEntry iconEntry = (IconEntry)theEObject;
 				T result = caseIconEntry(iconEntry);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.CONFIGURATION_ELEMENT: {
+			case ElementTypesConfigurationsPackage.CONFIGURATION_ELEMENT: {
 				ConfigurationElement configurationElement = (ConfigurationElement)theEObject;
 				T result = caseConfigurationElement(configurationElement);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION: {
 				AbstractMatcherConfiguration abstractMatcherConfiguration = (AbstractMatcherConfiguration)theEObject;
 				T result = caseAbstractMatcherConfiguration(abstractMatcherConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ADVICE_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ADVICE_CONFIGURATION: {
 				AdviceConfiguration adviceConfiguration = (AdviceConfiguration)theEObject;
 				T result = caseAdviceConfiguration(adviceConfiguration);
 				if (result == null) result = caseConfigurationElement(adviceConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION: {
 				AbstractAdviceBindingConfiguration abstractAdviceBindingConfiguration = (AbstractAdviceBindingConfiguration)theEObject;
 				T result = caseAbstractAdviceBindingConfiguration(abstractAdviceBindingConfiguration);
 				if (result == null) result = caseAdviceConfiguration(abstractAdviceBindingConfiguration);
@@ -128,7 +128,7 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.SPECIALIZATION_TYPE_CONFIGURATION: {
 				SpecializationTypeConfiguration specializationTypeConfiguration = (SpecializationTypeConfiguration)theEObject;
 				T result = caseSpecializationTypeConfiguration(specializationTypeConfiguration);
 				if (result == null) result = caseElementTypeConfiguration(specializationTypeConfiguration);
@@ -138,13 +138,13 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.CONTAINER_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.CONTAINER_CONFIGURATION: {
 				ContainerConfiguration containerConfiguration = (ContainerConfiguration)theEObject;
 				T result = caseContainerConfiguration(containerConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.METAMODEL_TYPE_CONFIGURATION: {
 				MetamodelTypeConfiguration metamodelTypeConfiguration = (MetamodelTypeConfiguration)theEObject;
 				T result = caseMetamodelTypeConfiguration(metamodelTypeConfiguration);
 				if (result == null) result = caseElementTypeConfiguration(metamodelTypeConfiguration);
@@ -154,7 +154,7 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ABSTRACT_EDIT_HELPER_ADVICE_CONFIGURATION: {
 				AbstractEditHelperAdviceConfiguration abstractEditHelperAdviceConfiguration = (AbstractEditHelperAdviceConfiguration)theEObject;
 				T result = caseAbstractEditHelperAdviceConfiguration(abstractEditHelperAdviceConfiguration);
 				if (result == null) result = caseAdviceConfiguration(abstractEditHelperAdviceConfiguration);
@@ -162,7 +162,7 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.EDIT_HELPER_ADVICE_CONFIGURATION: {
 				EditHelperAdviceConfiguration editHelperAdviceConfiguration = (EditHelperAdviceConfiguration)theEObject;
 				T result = caseEditHelperAdviceConfiguration(editHelperAdviceConfiguration);
 				if (result == null) result = caseAbstractEditHelperAdviceConfiguration(editHelperAdviceConfiguration);
@@ -171,7 +171,7 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.ADVICE_BINDING_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.ADVICE_BINDING_CONFIGURATION: {
 				AdviceBindingConfiguration adviceBindingConfiguration = (AdviceBindingConfiguration)theEObject;
 				T result = caseAdviceBindingConfiguration(adviceBindingConfiguration);
 				if (result == null) result = caseAbstractAdviceBindingConfiguration(adviceBindingConfiguration);
@@ -181,20 +181,20 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.MATCHER_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.MATCHER_CONFIGURATION: {
 				MatcherConfiguration matcherConfiguration = (MatcherConfiguration)theEObject;
 				T result = caseMatcherConfiguration(matcherConfiguration);
 				if (result == null) result = caseAbstractMatcherConfiguration(matcherConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.IDENTIFIED_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.IDENTIFIED_CONFIGURATION: {
 				IdentifiedConfiguration identifiedConfiguration = (IdentifiedConfiguration)theEObject;
 				T result = caseIdentifiedConfiguration(identifiedConfiguration);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ElementtypesconfigurationsPackage.NAMED_CONFIGURATION: {
+			case ElementTypesConfigurationsPackage.NAMED_CONFIGURATION: {
 				NamedConfiguration namedConfiguration = (NamedConfiguration)theEObject;
 				T result = caseNamedConfiguration(namedConfiguration);
 				if (result == null) result = defaultCase(theEObject);
@@ -460,4 +460,4 @@ public class ElementtypesconfigurationsSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //ElementtypesconfigurationsSwitch
+} //ElementTypesConfigurationsSwitch
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/resource/CustomElementtypesconfigurationsResourceFactoryImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceFactoryImpl.java
index d79e1679ca3..d3bb9f9cdda 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/resource/CustomElementtypesconfigurationsResourceFactoryImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceFactoryImpl.java
@@ -10,19 +10,18 @@
  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.resource;

+package org.eclipse.papyrus.infra.types.resource;

 

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceFactoryImpl;

+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceFactoryImpl;

 

-

-public class CustomElementtypesconfigurationsResourceFactoryImpl extends ElementtypesconfigurationsResourceFactoryImpl {

+public class CustomElementTypesConfigurationsResourceFactoryImpl extends ElementTypesConfigurationsResourceFactoryImpl {

 

 	@Override

 	public Resource createResource(URI uri) {

-		Resource result = new CustomElementtypesconfigurationsResourceImpl(uri);

+		Resource result = new CustomElementTypesConfigurationsResourceImpl(uri);

 		return result;

 	}

 

-} // ElementtypesconfigurationsResourceFactoryImpl

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/resource/CustomElementtypesconfigurationsResourceImpl.java b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceImpl.java
index 65955a484c8..790c49384d1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations/src/org/eclipse/papyrus/infra/elementtypesconfigurations/resource/CustomElementtypesconfigurationsResourceImpl.java
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types/src/org/eclipse/papyrus/infra/types/resource/CustomElementTypesConfigurationsResourceImpl.java
@@ -10,15 +10,14 @@
  * Contributors:

  *  CEA LIST - Initial API and implementation

  */

-package org.eclipse.papyrus.infra.elementtypesconfigurations.resource;

+package org.eclipse.papyrus.infra.types.resource;

 

 import org.eclipse.emf.common.util.URI;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsResourceImpl;

+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsResourceImpl;

 

+public class CustomElementTypesConfigurationsResourceImpl extends ElementTypesConfigurationsResourceImpl {

 

-public class CustomElementtypesconfigurationsResourceImpl extends ElementtypesconfigurationsResourceImpl {

-

-	public CustomElementtypesconfigurationsResourceImpl(URI uri) {

+	public CustomElementTypesConfigurationsResourceImpl(URI uri) {

 		super(uri);

 	}

 

@@ -26,5 +25,4 @@ public class CustomElementtypesconfigurationsResourceImpl extends Elementtypesco
 	protected boolean useUUIDs() {

 		return true;

 	}

-

 }

diff --git a/plugins/infra/types/pom.xml b/plugins/infra/types/pom.xml
new file mode 100644
index 00000000000..f9f460eff6e
--- /dev/null
+++ b/plugins/infra/types/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.infra-types</artifactId>
+	<packaging>pom</packaging>
+	<parent>
+	    <groupId>org.eclipse.papyrus</groupId>
+	    <artifactId>org.eclipse.papyrus.infra</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <name>Papyrus Infra Extended Element Types</name>
+	<description>Plug-ins contributing model-driven types to the GMF Run-time Element-Types registry.</description>
+
+	<modules>
+		<module>org.eclipse.papyrus.infra.types</module>
+		<module>org.eclipse.papyrus.infra.types.core</module>
+		<module>org.eclipse.papyrus.infra.types.edit</module>
+		<module>org.eclipse.papyrus.infra.types.editor</module>
+		<module>org.eclipse.papyrus.infra.types.rulebased</module>
+		<module>org.eclipse.papyrus.infra.types.ui</module>
+	</modules>
+</project>
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
index c27591ff9a9..b575b2d7e5f 100644
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0"
 Export-Package: org.eclipse.papyrus.infra.extendedtypes,
  org.eclipse.papyrus.infra.extendedtypes.advices,
  org.eclipse.papyrus.infra.extendedtypes.impl,
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
index 0c2aa4964ec..97d1ff2f286 100644
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedElementTypeSetRegistry.java
@@ -38,9 +38,9 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.internal.descriptors.IEditHelperAdviceDescriptor;
 import org.eclipse.gmf.runtime.emf.type.core.internal.impl.SpecializationTypeRegistry;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
 import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.osgi.framework.Bundle;
 
 /**
diff --git a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
index e94d7291781..649b2133248 100644
--- a/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
+++ b/plugins/infra/xtypes/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/infra/extendedtypes/UserExtendedTypesRegistry.java
@@ -24,8 +24,8 @@ import java.util.function.Predicate;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
 import org.eclipse.papyrus.infra.extendedtypes.internal.spi.IUserExtendedTypesProvider;
+import org.eclipse.papyrus.infra.types.core.Activator;
 
 /**
  * Registry of {@link IUserExtendedTypesProvider}s.
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
index e480b7c4f66..d4ddce72c7f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
index 6da5ab8edfd..4fcfcb76579 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-activities.elementtypesconfigurations
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetActivities" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities" name="elementTypeSetActivities" xmi:id="_rRIxgLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Optional" identifier="org.eclipse.papyrus.sysml.stereotype.Optional" name="SysML::Stereotype::Optional" xmi:id="_rRIxgbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Optional"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Rate" identifier="org.eclipse.papyrus.sysml.stereotype.Rate" name="SysML::Stereotype::Rate" xmi:id="_rRIxgrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Rate"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Probability" identifier="org.eclipse.papyrus.sysml.stereotype.Probability" name="SysML::Stereotype::Probability" xmi:id="_rRIxg7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Probability"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Continuous" identifier="org.eclipse.papyrus.sysml.stereotype.Continuous" name="SysML::Stereotype::Continuous" xmi:id="_rRIxhLOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Continuous"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Discrete" identifier="org.eclipse.papyrus.sysml.stereotype.Discrete" name="SysML::Stereotype::Discrete" xmi:id="_rRIxhbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Discrete"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ControlOperator" identifier="org.eclipse.papyrus.sysml.stereotype.ControlOperator" name="SysML::Stereotype::ControlOperator" xmi:id="_rRIxhrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/ControlOperator"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::NoBuffer" identifier="org.eclipse.papyrus.sysml.stereotype.NoBuffer" name="SysML::Stereotype::NoBuffer" xmi:id="_rRIxh7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/NoBuffer"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Overwrite" identifier="org.eclipse.papyrus.sysml.stereotype.Overwrite" name="SysML::Stereotype::Overwrite" xmi:id="_rRIxiLOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Overwrite"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetActivities" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Activities" name="elementTypeSetActivities" xmi:id="_rRIxgLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Optional" identifier="org.eclipse.papyrus.sysml.stereotype.Optional" name="SysML::Stereotype::Optional" xmi:id="_rRIxgbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Optional"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Rate" identifier="org.eclipse.papyrus.sysml.stereotype.Rate" name="SysML::Stereotype::Rate" xmi:id="_rRIxgrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Rate"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Probability" identifier="org.eclipse.papyrus.sysml.stereotype.Probability" name="SysML::Stereotype::Probability" xmi:id="_rRIxg7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Probability"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Continuous" identifier="org.eclipse.papyrus.sysml.stereotype.Continuous" name="SysML::Stereotype::Continuous" xmi:id="_rRIxhLOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Continuous"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Discrete" identifier="org.eclipse.papyrus.sysml.stereotype.Discrete" name="SysML::Stereotype::Discrete" xmi:id="_rRIxhbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Discrete"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ControlOperator" identifier="org.eclipse.papyrus.sysml.stereotype.ControlOperator" name="SysML::Stereotype::ControlOperator" xmi:id="_rRIxhrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/ControlOperator"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::NoBuffer" identifier="org.eclipse.papyrus.sysml.stereotype.NoBuffer" name="SysML::Stereotype::NoBuffer" xmi:id="_rRIxh7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/NoBuffer"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Overwrite" identifier="org.eclipse.papyrus.sysml.stereotype.Overwrite" name="SysML::Stereotype::Overwrite" xmi:id="_rRIxiLOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//activities/Overwrite"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
index 4e5784e7e39..1cf2257b994 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-allocations.elementtypesconfigurations
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetAllocations" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations" name="elementTypeSetAllocations" xmi:id="_u9Zn4LOjEeWH6Y3Wi2YKxg" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Allocate" identifier="org.eclipse.papyrus.sysml.stereotype.Allocate" name="SysML::Stereotype::Allocate" xmi:id="_u9Zn4bOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocate"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Allocated" identifier="org.eclipse.papyrus.sysml.stereotype.Allocated" name="SysML::Stereotype::Allocated" xmi:id="_u9Zn4rOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocated"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::AllocateActivityPartition" identifier="org.eclipse.papyrus.sysml.stereotype.AllocateActivityPartition" name="SysML::Stereotype::AllocateActivityPartition" xmi:id="_u9Zn47OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/AllocateActivityPartition"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetAllocations" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Allocations" name="elementTypeSetAllocations" xmi:id="_u9Zn4LOjEeWH6Y3Wi2YKxg" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Allocate" identifier="org.eclipse.papyrus.sysml.stereotype.Allocate" name="SysML::Stereotype::Allocate" xmi:id="_u9Zn4bOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocate"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Allocated" identifier="org.eclipse.papyrus.sysml.stereotype.Allocated" name="SysML::Stereotype::Allocated" xmi:id="_u9Zn4rOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/Allocated"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::AllocateActivityPartition" identifier="org.eclipse.papyrus.sysml.stereotype.AllocateActivityPartition" name="SysML::Stereotype::AllocateActivityPartition" xmi:id="_u9Zn47OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//allocations/AllocateActivityPartition"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
index a78272353f1..f5880e1582b 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-blocks.elementtypesconfigurations
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetBlocks" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" name="elementTypeSetBlocks" xmi:id="_3i038FYIEeS0WsAAtVmToA" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Block" identifier="org.eclipse.papyrus.sysml.stereotype.Block" name="SysML::Stereotype::Block" xmi:id="_hYtREFYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::DistributedProperty" identifier="org.eclipse.papyrus.sysml.stereotype.DistributedProperty" name="SysML::Stereotype::DistributedProperty" xmi:id="_hYtREVYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/DistributedProperty"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Dimension" identifier="org.eclipse.papyrus.sysml.stereotype.Dimension" name="SysML::Stereotype::Dimension" xmi:id="_hYtRElYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Dimension"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Unit" identifier="org.eclipse.papyrus.sysml.stereotype.Unit" name="SysML::Stereotype::Unit" xmi:id="_hYtRE1YGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Unit"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ValueType" identifier="org.eclipse.papyrus.sysml.stereotype.ValueType" name="SysML::Stereotype::ValueType" xmi:id="_hYtRFFYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ValueType"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::NestedConnectorEnd" identifier="org.eclipse.papyrus.sysml.stereotype.NestedConnectorEnd" name="SysML::Stereotype::NestedConnectorEnd" xmi:id="_hYtRFVYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/NestedConnectorEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ParticipantProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ParticipantProperty" name="SysML::Stereotype::ParticipantProperty" xmi:id="_hYtRFlYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ParticipantProperty"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ConnectorProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConnectorProperty" name="SysML::Stereotype::ConnectorProperty" xmi:id="_hYtRF1YGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ConnectorProperty"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::BindingConnector" identifier="org.eclipse.papyrus.sysml.stereotype.BindingConnector" name="SysML::Stereotype::BindingConnector" xmi:id="_hYtRGFYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/BindingConnector"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::PropertySpecificType" identifier="org.eclipse.papyrus.sysml.stereotype.PropertySpecificType" name="SysML::Stereotype::PropertySpecificType" xmi:id="_hYtRGVYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/PropertySpecificType"/>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.stereotype.helper.advice.BlockEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.stereotype.advice.Block" inheritance="all" target="_hYtREFYGEeS0WsAAtVmToA" xmi:id="_4Jt40FYIEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetBlocks" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Blocks" name="elementTypeSetBlocks" xmi:id="_3i038FYIEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Block" identifier="org.eclipse.papyrus.sysml.stereotype.Block" name="SysML::Stereotype::Block" xmi:id="_hYtREFYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::DistributedProperty" identifier="org.eclipse.papyrus.sysml.stereotype.DistributedProperty" name="SysML::Stereotype::DistributedProperty" xmi:id="_hYtREVYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/DistributedProperty"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Dimension" identifier="org.eclipse.papyrus.sysml.stereotype.Dimension" name="SysML::Stereotype::Dimension" xmi:id="_hYtRElYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Dimension"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Unit" identifier="org.eclipse.papyrus.sysml.stereotype.Unit" name="SysML::Stereotype::Unit" xmi:id="_hYtRE1YGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Unit"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ValueType" identifier="org.eclipse.papyrus.sysml.stereotype.ValueType" name="SysML::Stereotype::ValueType" xmi:id="_hYtRFFYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ValueType"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::NestedConnectorEnd" identifier="org.eclipse.papyrus.sysml.stereotype.NestedConnectorEnd" name="SysML::Stereotype::NestedConnectorEnd" xmi:id="_hYtRFVYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/NestedConnectorEnd"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ParticipantProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ParticipantProperty" name="SysML::Stereotype::ParticipantProperty" xmi:id="_hYtRFlYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ParticipantProperty"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ConnectorProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConnectorProperty" name="SysML::Stereotype::ConnectorProperty" xmi:id="_hYtRF1YGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/ConnectorProperty"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::BindingConnector" identifier="org.eclipse.papyrus.sysml.stereotype.BindingConnector" name="SysML::Stereotype::BindingConnector" xmi:id="_hYtRGFYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/BindingConnector"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::PropertySpecificType" identifier="org.eclipse.papyrus.sysml.stereotype.PropertySpecificType" name="SysML::Stereotype::PropertySpecificType" xmi:id="_hYtRGVYGEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/PropertySpecificType"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.stereotype.helper.advice.BlockEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.stereotype.advice.Block" inheritance="all" target="_hYtREFYGEeS0WsAAtVmToA" xmi:id="_4Jt40FYIEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
index 5af3d8f3998..6aa1dedf629 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-constraints.elementtypesconfigurations
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetConstraints" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints" name="elementTypeSetConstraints" xmi:id="_0h9coLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ConstraintBlock" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintBlock" name="SysML::Stereotype::ConstraintBlock" xmi:id="_0h9cobOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ConstraintProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintProperty" name="SysML::Stereotype::ConstraintProperty" xmi:id="_0h9corOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetConstraints" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Constraints" name="elementTypeSetConstraints" xmi:id="_0h9coLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ConstraintBlock" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintBlock" name="SysML::Stereotype::ConstraintBlock" xmi:id="_0h9cobOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ConstraintProperty" identifier="org.eclipse.papyrus.sysml.stereotype.ConstraintProperty" name="SysML::Stereotype::ConstraintProperty" xmi:id="_0h9corOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
index e35abc81c72..0c6c4b25455 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-modelelements.elementtypesconfigurations
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetModelElements" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements" name="elementTypeSetModelElements" xmi:id="_2o9lYLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Conform" identifier="org.eclipse.papyrus.sysml.stereotype.Conform" name="SysML::Stereotype::Conform" xmi:id="_2o9lYbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Conform"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::View" identifier="org.eclipse.papyrus.sysml.stereotype.View" name="SysML::Stereotype::View" xmi:id="_2o9lYrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/View"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ViewPoint" identifier="org.eclipse.papyrus.sysml.stereotype.ViewPoint" name="SysML::Stereotype::ViewPoint" xmi:id="_2o9lY7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/ViewPoint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Rationale" identifier="org.eclipse.papyrus.sysml.stereotype.Rationale" name="SysML::Stereotype::Rationale" xmi:id="_2o9lZLOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Rationale"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Problem" identifier="org.eclipse.papyrus.sysml.stereotype.Problem" name="SysML::Stereotype::Problem" xmi:id="_2o9lZbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Problem"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetModelElements" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/ModelElements" name="elementTypeSetModelElements" xmi:id="_2o9lYLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Conform" identifier="org.eclipse.papyrus.sysml.stereotype.Conform" name="SysML::Stereotype::Conform" xmi:id="_2o9lYbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Conform"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::View" identifier="org.eclipse.papyrus.sysml.stereotype.View" name="SysML::Stereotype::View" xmi:id="_2o9lYrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/View"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ViewPoint" identifier="org.eclipse.papyrus.sysml.stereotype.ViewPoint" name="SysML::Stereotype::ViewPoint" xmi:id="_2o9lY7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/ViewPoint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Rationale" identifier="org.eclipse.papyrus.sysml.stereotype.Rationale" name="SysML::Stereotype::Rationale" xmi:id="_2o9lZLOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Rationale"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Problem" identifier="org.eclipse.papyrus.sysml.stereotype.Problem" name="SysML::Stereotype::Problem" xmi:id="_2o9lZbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//modelelements/Problem"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
index 42a2ec77016..4da11c58d49 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-portsandflows.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetPortsAndFlows" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows" name="elementTypeSetPortsAndFlows" xmi:id="_6wATQLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::FlowPort" identifier="org.eclipse.papyrus.sysml.stereotype.FlowPort" name="SysML::Stereotype::FlowPort" xmi:id="_6wATQbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowPort"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::FlowProperty" identifier="org.eclipse.papyrus.sysml.stereotype.FlowProperty" name="SysML::Stereotype::FlowProperty" xmi:id="_6wATQrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowProperty"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::FlowSpecification" identifier="org.eclipse.papyrus.sysml.stereotype.FlowSpecification" name="SysML::Stereotype::FlowSpecification" xmi:id="_6wATQ7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ItemFlow" identifier="org.eclipse.papyrus.sysml.stereotype.ItemFlow" name="SysML::Stereotype::ItemFlow" xmi:id="_6wA6ULOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/ItemFlow"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetPortsAndFlows" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/PortAndFlows" name="elementTypeSetPortsAndFlows" xmi:id="_6wATQLOjEeWH6Y3Wi2YKxg" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::FlowPort" identifier="org.eclipse.papyrus.sysml.stereotype.FlowPort" name="SysML::Stereotype::FlowPort" xmi:id="_6wATQbOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowPort"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::FlowProperty" identifier="org.eclipse.papyrus.sysml.stereotype.FlowProperty" name="SysML::Stereotype::FlowProperty" xmi:id="_6wATQrOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowProperty"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::FlowSpecification" identifier="org.eclipse.papyrus.sysml.stereotype.FlowSpecification" name="SysML::Stereotype::FlowSpecification" xmi:id="_6wATQ7OjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/FlowSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::ItemFlow" identifier="org.eclipse.papyrus.sysml.stereotype.ItemFlow" name="SysML::Stereotype::ItemFlow" xmi:id="_6wA6ULOjEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//portandflows/ItemFlow"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
index 9461a0d6acc..411f7ef648e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml-requirements.elementtypesconfigurations
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetRequirements" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" name="elementTypeSetRequirements" xmi:id="_LYuC4LOtEeWH6Y3Wi2YKxg" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::DeriveReqt" identifier="org.eclipse.papyrus.sysml.stereotype.DeriveReqt" name="SysML::Stereotype::DeriveReqt" xmi:id="_LYuC4bOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/DeriveReqt"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Verify" identifier="org.eclipse.papyrus.sysml.stereotype.Verify" name="SysML::Stereotype::Verify" xmi:id="_LYuC4rOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Verify"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Copy" identifier="org.eclipse.papyrus.sysml.stereotype.Copy" name="SysML::Stereotype::Copy" xmi:id="_LYuC47OtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Copy"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Satisfy" identifier="org.eclipse.papyrus.sysml.stereotype.Satisfy" name="SysML::Stereotype::Satisfy" xmi:id="_LYuC5LOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Satisfy"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::TestCase" identifier="org.eclipse.papyrus.sysml.stereotype.TestCase" name="SysML::Stereotype::TestCase" xmi:id="_LYuC5bOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/TestCase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Requirement" identifier="org.eclipse.papyrus.sysml.stereotype.Requirement" name="SysML::Stereotype::Requirement" xmi:id="_LYuC5rOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::RequirementRelated" identifier="org.eclipse.papyrus.sysml.stereotype.RequirementRelated" name="SysML::Stereotype::RequirementRelated" xmi:id="_LYuC57OtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/RequirementRelated"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetRequirements" metamodelNsURI="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" name="elementTypeSetRequirements" xmi:id="_LYuC4LOtEeWH6Y3Wi2YKxg" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::DeriveReqt" identifier="org.eclipse.papyrus.sysml.stereotype.DeriveReqt" name="SysML::Stereotype::DeriveReqt" xmi:id="_LYuC4bOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/DeriveReqt"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Verify" identifier="org.eclipse.papyrus.sysml.stereotype.Verify" name="SysML::Stereotype::Verify" xmi:id="_LYuC4rOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Verify"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Copy" identifier="org.eclipse.papyrus.sysml.stereotype.Copy" name="SysML::Stereotype::Copy" xmi:id="_LYuC47OtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Copy"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Satisfy" identifier="org.eclipse.papyrus.sysml.stereotype.Satisfy" name="SysML::Stereotype::Satisfy" xmi:id="_LYuC5LOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Satisfy"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::TestCase" identifier="org.eclipse.papyrus.sysml.stereotype.TestCase" name="SysML::Stereotype::TestCase" xmi:id="_LYuC5bOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/TestCase"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::Requirement" identifier="org.eclipse.papyrus.sysml.stereotype.Requirement" name="SysML::Stereotype::Requirement" xmi:id="_LYuC5rOtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="SysML::Stereotype::RequirementRelated" identifier="org.eclipse.papyrus.sysml.stereotype.RequirementRelated" name="SysML::Stereotype::RequirementRelated" xmi:id="_LYuC57OtEeWH6Y3Wi2YKxg" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/RequirementRelated"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
index 63cd70ff49b..960f5165acd 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations
@@ -1,247 +1,247 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetSysML" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="elementTypeSetSysML" xmi:id="_649xgFYBEeS0WsAAtVmToA" xmi:version="2.0">
-  <elementTypeConfigurations hint="SysML::ActorPartProperty" identifier="org.eclipse.papyrus.sysml.ActorPartProperty" name="SysML::ActorPartProperty" xmi:id="_64-_oFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65ANwFYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ActorPartPropertyEditHelperAdvice" xmi:id="_65Bb4FYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ActorPartPropertyMatcher" xmi:id="_65CC8FYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Allocate" identifier="org.eclipse.papyrus.sysml.Allocate" name="SysML::Allocate" xmi:id="_65CC8VYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice" xmi:id="_65CC8lYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher" xmi:id="_65CC81YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Association" identifier="org.eclipse.papyrus.sysml.Association" name="SysML::Association" xmi:id="_65CC9FYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.AssociationBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice" xmi:id="_65CqAFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher" xmi:id="_65CqAVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::AssociationComposite" identifier="org.eclipse.papyrus.sysml.AssociationComposite" name="SysML::AssociationComposite" xmi:id="_65CqAlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice" xmi:id="_65CqA1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqBFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::AssociationCompositeDirected" identifier="org.eclipse.papyrus.sysml.AssociationCompositeDirected" name="SysML::AssociationCompositeDirected" xmi:id="_65CqBVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice" xmi:id="_65CqBlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqB1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::AssociationNone" identifier="org.eclipse.papyrus.sysml.AssociationNone" name="SysML::AssociationNone" xmi:id="_65CqCFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice" xmi:id="_65CqCVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqClYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::AssociationNoneDirected" identifier="org.eclipse.papyrus.sysml.AssociationNoneDirected" name="SysML::AssociationNoneDirected" xmi:id="_65CqC1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice" xmi:id="_65CqDFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqDVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::AssociationShared" identifier="org.eclipse.papyrus.sysml.AssociationShared" name="SysML::AssociationShared" xmi:id="_65CqDlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice" xmi:id="_65CqD1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqEFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::AssociationSharedDirected" identifier="org.eclipse.papyrus.sysml.AssociationSharedDirected" name="SysML::AssociationSharedDirected" xmi:id="_65CqEVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice" xmi:id="_65DREFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65DREVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Block" identifier="org.eclipse.papyrus.sysml.Block" name="SysML::Block" xmi:id="_65DRElYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/Block.gif" xmi:id="_65DRE1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice" xmi:id="_65DRFFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher" xmi:id="_65DRFVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Conform" identifier="org.eclipse.papyrus.sysml.Conform" name="SysML::Conform" xmi:id="_65DRFlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Conform.gif" xmi:id="_65DRF1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice" xmi:id="_65DRGFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher" xmi:id="_65DRGVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ConstraintBlock" identifier="org.eclipse.papyrus.sysml.ConstraintBlock" name="SysML::ConstraintBlock" xmi:id="_65DRGlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/constraints/ConstraintBlock.gif" xmi:id="_65DRG1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice" xmi:id="_65DRHFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher" xmi:id="_65DRHVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ConstraintProperty" identifier="org.eclipse.papyrus.sysml.ConstraintProperty" name="SysML::ConstraintProperty" xmi:id="_65DRHlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/constraints/ConstraintProperty.gif" xmi:id="_65DRH1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice" xmi:id="_65DRIFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher" xmi:id="_65DRIVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Copy" identifier="org.eclipse.papyrus.sysml.Copy" name="SysML::Copy" xmi:id="_65DRIlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Copy.gif" xmi:id="_65DRI1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice" xmi:id="_65DRJFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher" xmi:id="_65DRJVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::DeriveReqt" identifier="org.eclipse.papyrus.sysml.DeriveReqt" name="SysML::DeriveReqt" xmi:id="_65D4IFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/DeriveReqt.gif" xmi:id="_65D4IVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice" xmi:id="_65D4IlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher" xmi:id="_65D4I1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Dimension" identifier="org.eclipse.papyrus.sysml.Dimension" name="SysML::Dimension" xmi:id="_65D4JFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/Dimension.gif" xmi:id="_65D4JVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice" xmi:id="_65D4JlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher" xmi:id="_65D4J1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowPort" identifier="org.eclipse.papyrus.sysml.FlowPort" name="SysML::FlowPort" xmi:id="_65D4KFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4KVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice" xmi:id="_65D4KlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher" xmi:id="_65D4K1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowPort_InOut" identifier="org.eclipse.papyrus.sysml.FlowPort_InOut" name="SysML::FlowPort_InOut" xmi:id="_65D4LFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4LVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice" xmi:id="_65D4LlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher" xmi:id="_65D4L1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowPort_In" identifier="org.eclipse.papyrus.sysml.FlowPort_In" name="SysML::FlowPort_In" xmi:id="_65D4MFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4MVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice" xmi:id="_65D4MlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher" xmi:id="_65D4M1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowPort_Out" identifier="org.eclipse.papyrus.sysml.FlowPort_Out" name="SysML::FlowPort_Out" xmi:id="_65D4NFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4NVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice" xmi:id="_65D4NlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher" xmi:id="_65EfMFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowPort_NA" identifier="org.eclipse.papyrus.sysml.FlowPort_NA" name="SysML::FlowPort_NA" xmi:id="_65EfMVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort_NA.gif" xmi:id="_65EfMlYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice" xmi:id="_65EfM1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher" xmi:id="_65EfNFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowProperty" identifier="org.eclipse.papyrus.sysml.FlowProperty" name="SysML::FlowProperty" xmi:id="_65EfNVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowProperty.gif" xmi:id="_65EfNlYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice" xmi:id="_65EfN1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher" xmi:id="_65EfOFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::FlowSpecification" identifier="org.eclipse.papyrus.sysml.FlowSpecification" name="SysML::FlowSpecification" xmi:id="_65EfOVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowSpecification.gif" xmi:id="_65EfOlYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice" xmi:id="_65EfO1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher" xmi:id="_65EfPFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ItemFlow" identifier="org.eclipse.papyrus.sysml.ItemFlow" name="SysML::ItemFlow" xmi:id="_65EfPVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/ItemFlow.gif" xmi:id="_65EfPlYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice" xmi:id="_65EfP1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher" xmi:id="_65EfQFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::PartProperty" identifier="org.eclipse.papyrus.sysml.PartProperty" name="SysML::PartProperty" xmi:id="_65EfQVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65EfQlYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice" xmi:id="_65EfQ1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher" xmi:id="_65EfRFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Problem" identifier="org.eclipse.papyrus.sysml.Problem" name="SysML::Problem" xmi:id="_65EfRVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Problem.gif" xmi:id="_65EfRlYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice" xmi:id="_65FGQFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher" xmi:id="_65FGQVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Rationale" identifier="org.eclipse.papyrus.sysml.Rationale" name="SysML::Rationale" xmi:id="_65FGQlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Rationale.gif" xmi:id="_65FGQ1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice" xmi:id="_65FGRFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher" xmi:id="_65FGRVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ReferenceProperty" identifier="org.eclipse.papyrus.sysml.ReferenceProperty" name="SysML::ReferenceProperty" xmi:id="_65FGRlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65FGR1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice" xmi:id="_65FGSFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher" xmi:id="_65FGSVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Requirement" identifier="org.eclipse.papyrus.sysml.Requirement" name="SysML::Requirement" xmi:id="_65FGSlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Requirement.gif" xmi:id="_65FGS1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice" xmi:id="_65FGTFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher" xmi:id="_65FGTVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Satisfy" identifier="org.eclipse.papyrus.sysml.Satisfy" name="SysML::Satisfy" xmi:id="_65FGTlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Satisfy.gif" xmi:id="_65FGT1YBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice" xmi:id="_65FGUFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher" xmi:id="_65FGUVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Unit" identifier="org.eclipse.papyrus.sysml.Unit" name="SysML::Unit" xmi:id="_65FtUFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/Unit.gif" xmi:id="_65FtUVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice" xmi:id="_65FtUlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher" xmi:id="_65FtU1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ValueProperty" identifier="org.eclipse.papyrus.sysml.ValueProperty" name="SysML::ValueProperty" xmi:id="_65FtVFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65FtVVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice" xmi:id="_65FtVlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher" xmi:id="_65FtV1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ValueType" identifier="org.eclipse.papyrus.sysml.ValueType" name="SysML::ValueType" xmi:id="_65FtWFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/ValueType.gif" xmi:id="_65FtWVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" xmi:id="_65FtWlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher" xmi:id="_65FtW1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ValueType_Enumeration" identifier="org.eclipse.papyrus.sysml.ValueType_Enumeration" name="SysML::ValueType_Enumeration" xmi:id="_65FtXFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/ValueType.gif" xmi:id="_65FtXVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" xmi:id="_65FtXlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher" xmi:id="_65FtX1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ValueType_PrimitiveType" identifier="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" name="SysML::ValueType_PrimitiveType" xmi:id="_65FtYFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/ValueType.gif" xmi:id="_65FtYVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" xmi:id="_65FtYlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher" xmi:id="_65FtY1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::Verify" identifier="org.eclipse.papyrus.sysml.Verify" name="SysML::Verify" xmi:id="_65GUYFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Verify.gif" xmi:id="_65GUYVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice" xmi:id="_65GUYlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher" xmi:id="_65GUY1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::View" identifier="org.eclipse.papyrus.sysml.View" name="SysML::View" xmi:id="_65GUZFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/View.gif" xmi:id="_65GUZVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice" xmi:id="_65GUZlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher" xmi:id="_65GUZ1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ViewPoint" identifier="org.eclipse.papyrus.sysml.ViewPoint" name="SysML::ViewPoint" xmi:id="_65GUaFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Viewpoint.gif" xmi:id="_65GUaVYBEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice" xmi:id="_65GUalYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher" xmi:id="_65GUa1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="SysML::ConstraintBlockParameter" identifier="org.eclipse.papyrus.sysml.ConstraintBlockParameter" name="SysML::ConstraintBlockParameter" xmi:id="_hoac0FYNEeSSidqjsigY_Q" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_2MWa8FYNEeSSidqjsigY_Q"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice" xmi:id="_pV9-YFYNEeSSidqjsigY_Q" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_4QgrEFYNEeSSidqjsigY_Q" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" inheritance="all" xmi:id="_65IJkFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Classifier" inheritance="all" xmi:id="_Kse4IFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0z1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.BlockConnectorEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.BlockConnector" inheritance="all" target="_65DRElYBEeS0WsAAtVmToA" xmi:id="_XFKsEFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ConnectorEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Connector" inheritance="all" xmi:id="_iARuwFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC9VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Property" inheritance="all" xmi:id="_pCAFEFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PackageEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Package" inheritance="all" xmi:id="_vpsKwFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ActorEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Actor" inheritance="all" xmi:id="_2t_7AFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScV8UVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.sysml.service.types.elementTypeSetSysML" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="elementTypeSetSysML" xmi:id="_649xgFYBEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations hint="SysML::ActorPartProperty" identifier="org.eclipse.papyrus.sysml.ActorPartProperty" name="SysML::ActorPartProperty" xmi:id="_64-_oFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65ANwFYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ActorPartPropertyEditHelperAdvice" xmi:id="_65Bb4FYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ActorPartPropertyMatcher" xmi:id="_65CC8FYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Allocate" identifier="org.eclipse.papyrus.sysml.Allocate" name="SysML::Allocate" xmi:id="_65CC8VYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.AllocateEditHelperAdvice" xmi:id="_65CC8lYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AllocateMatcher" xmi:id="_65CC81YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Association" identifier="org.eclipse.papyrus.sysml.Association" name="SysML::Association" xmi:id="_65CC9FYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.AssociationBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationEditHelperAdvice" xmi:id="_65CqAFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.AssociationMatcher" xmi:id="_65CqAVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::AssociationComposite" identifier="org.eclipse.papyrus.sysml.AssociationComposite" name="SysML::AssociationComposite" xmi:id="_65CqAlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeEditHelperAdvice" xmi:id="_65CqA1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqBFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::AssociationCompositeDirected" identifier="org.eclipse.papyrus.sysml.AssociationCompositeDirected" name="SysML::AssociationCompositeDirected" xmi:id="_65CqBVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice" xmi:id="_65CqBlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqB1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::AssociationNone" identifier="org.eclipse.papyrus.sysml.AssociationNone" name="SysML::AssociationNone" xmi:id="_65CqCFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneEditHelperAdvice" xmi:id="_65CqCVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqClYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::AssociationNoneDirected" identifier="org.eclipse.papyrus.sysml.AssociationNoneDirected" name="SysML::AssociationNoneDirected" xmi:id="_65CqC1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationNoneDirectedEditHelperAdvice" xmi:id="_65CqDFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqDVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::AssociationShared" identifier="org.eclipse.papyrus.sysml.AssociationShared" name="SysML::AssociationShared" xmi:id="_65CqDlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedEditHelperAdvice" xmi:id="_65CqD1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65CqEFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::AssociationSharedDirected" identifier="org.eclipse.papyrus.sysml.AssociationSharedDirected" name="SysML::AssociationSharedDirected" xmi:id="_65CqEVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.sysml.Association</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice" xmi:id="_65DREFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_65DREVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Block" identifier="org.eclipse.papyrus.sysml.Block" name="SysML::Block" xmi:id="_65DRElYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/Block.gif" xmi:id="_65DRE1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.BlockEditHelperAdvice" xmi:id="_65DRFFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.BlockMatcher" xmi:id="_65DRFVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Conform" identifier="org.eclipse.papyrus.sysml.Conform" name="SysML::Conform" xmi:id="_65DRFlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Conform.gif" xmi:id="_65DRF1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConformEditHelperAdvice" xmi:id="_65DRGFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConformMatcher" xmi:id="_65DRGVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ConstraintBlock" identifier="org.eclipse.papyrus.sysml.ConstraintBlock" name="SysML::ConstraintBlock" xmi:id="_65DRGlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/constraints/ConstraintBlock.gif" xmi:id="_65DRG1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockEditHelperAdvice" xmi:id="_65DRHFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintBlockMatcher" xmi:id="_65DRHVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ConstraintProperty" identifier="org.eclipse.papyrus.sysml.ConstraintProperty" name="SysML::ConstraintProperty" xmi:id="_65DRHlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/constraints/ConstraintProperty.gif" xmi:id="_65DRH1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintPropertyEditHelperAdvice" xmi:id="_65DRIFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ConstraintPropertyMatcher" xmi:id="_65DRIVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Copy" identifier="org.eclipse.papyrus.sysml.Copy" name="SysML::Copy" xmi:id="_65DRIlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Copy.gif" xmi:id="_65DRI1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.CopyEditHelperAdvice" xmi:id="_65DRJFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.CopyMatcher" xmi:id="_65DRJVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::DeriveReqt" identifier="org.eclipse.papyrus.sysml.DeriveReqt" name="SysML::DeriveReqt" xmi:id="_65D4IFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/DeriveReqt.gif" xmi:id="_65D4IVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DeriveReqtEditHelperAdvice" xmi:id="_65D4IlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DeriveReqtMatcher" xmi:id="_65D4I1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Dimension" identifier="org.eclipse.papyrus.sysml.Dimension" name="SysML::Dimension" xmi:id="_65D4JFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/Dimension.gif" xmi:id="_65D4JVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.DimensionEditHelperAdvice" xmi:id="_65D4JlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.DimensionMatcher" xmi:id="_65D4J1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowPort" identifier="org.eclipse.papyrus.sysml.FlowPort" name="SysML::FlowPort" xmi:id="_65D4KFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4KVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortEditHelperAdvice" xmi:id="_65D4KlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortMatcher" xmi:id="_65D4K1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowPort_InOut" identifier="org.eclipse.papyrus.sysml.FlowPort_InOut" name="SysML::FlowPort_InOut" xmi:id="_65D4LFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4LVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInOutEditHelperAdvice" xmi:id="_65D4LlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInOutMatcher" xmi:id="_65D4L1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowPort_In" identifier="org.eclipse.papyrus.sysml.FlowPort_In" name="SysML::FlowPort_In" xmi:id="_65D4MFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4MVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortInEditHelperAdvice" xmi:id="_65D4MlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortInMatcher" xmi:id="_65D4M1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowPort_Out" identifier="org.eclipse.papyrus.sysml.FlowPort_Out" name="SysML::FlowPort_Out" xmi:id="_65D4NFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort.gif" xmi:id="_65D4NVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortOutEditHelperAdvice" xmi:id="_65D4NlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortOutMatcher" xmi:id="_65EfMFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowPort_NA" identifier="org.eclipse.papyrus.sysml.FlowPort_NA" name="SysML::FlowPort_NA" xmi:id="_65EfMVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowPort_NA.gif" xmi:id="_65EfMlYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.sysml.FlowPort</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPortNAEditHelperAdvice" xmi:id="_65EfM1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPortNAMatcher" xmi:id="_65EfNFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowProperty" identifier="org.eclipse.papyrus.sysml.FlowProperty" name="SysML::FlowProperty" xmi:id="_65EfNVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowProperty.gif" xmi:id="_65EfNlYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowPropertyEditHelperAdvice" xmi:id="_65EfN1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowPropertyMatcher" xmi:id="_65EfOFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::FlowSpecification" identifier="org.eclipse.papyrus.sysml.FlowSpecification" name="SysML::FlowSpecification" xmi:id="_65EfOVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/FlowSpecification.gif" xmi:id="_65EfOlYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.FlowSpecificationEditHelperAdvice" xmi:id="_65EfO1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.FlowSpecificationMatcher" xmi:id="_65EfPFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ItemFlow" identifier="org.eclipse.papyrus.sysml.ItemFlow" name="SysML::ItemFlow" xmi:id="_65EfPVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/portandflows/ItemFlow.gif" xmi:id="_65EfPlYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ItemFlowEditHelperAdvice" xmi:id="_65EfP1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ItemFlowMatcher" xmi:id="_65EfQFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::PartProperty" identifier="org.eclipse.papyrus.sysml.PartProperty" name="SysML::PartProperty" xmi:id="_65EfQVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65EfQlYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.PartPropertyEditHelperAdvice" xmi:id="_65EfQ1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.PartPropertyMatcher" xmi:id="_65EfRFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Problem" identifier="org.eclipse.papyrus.sysml.Problem" name="SysML::Problem" xmi:id="_65EfRVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Problem.gif" xmi:id="_65EfRlYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ProblemEditHelperAdvice" xmi:id="_65FGQFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ProblemMatcher" xmi:id="_65FGQVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Rationale" identifier="org.eclipse.papyrus.sysml.Rationale" name="SysML::Rationale" xmi:id="_65FGQlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Rationale.gif" xmi:id="_65FGQ1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RationaleEditHelperAdvice" xmi:id="_65FGRFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RationaleMatcher" xmi:id="_65FGRVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ReferenceProperty" identifier="org.eclipse.papyrus.sysml.ReferenceProperty" name="SysML::ReferenceProperty" xmi:id="_65FGRlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65FGR1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ReferencePropertyEditHelperAdvice" xmi:id="_65FGSFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ReferencePropertyMatcher" xmi:id="_65FGSVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Requirement" identifier="org.eclipse.papyrus.sysml.Requirement" name="SysML::Requirement" xmi:id="_65FGSlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Requirement.gif" xmi:id="_65FGS1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.RequirementEditHelperAdvice" xmi:id="_65FGTFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.RequirementMatcher" xmi:id="_65FGTVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Satisfy" identifier="org.eclipse.papyrus.sysml.Satisfy" name="SysML::Satisfy" xmi:id="_65FGTlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Satisfy.gif" xmi:id="_65FGT1YBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.SatisfyEditHelperAdvice" xmi:id="_65FGUFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.SatisfyMatcher" xmi:id="_65FGUVYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Unit" identifier="org.eclipse.papyrus.sysml.Unit" name="SysML::Unit" xmi:id="_65FtUFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/Unit.gif" xmi:id="_65FtUVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.UnitEditHelperAdvice" xmi:id="_65FtUlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.UnitMatcher" xmi:id="_65FtU1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ValueProperty" identifier="org.eclipse.papyrus.sysml.ValueProperty" name="SysML::ValueProperty" xmi:id="_65FtVFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_65FtVVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValuePropertyEditHelperAdvice" xmi:id="_65FtVlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValuePropertyMatcher" xmi:id="_65FtV1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ValueType" identifier="org.eclipse.papyrus.sysml.ValueType" name="SysML::ValueType" xmi:id="_65FtWFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/ValueType.gif" xmi:id="_65FtWVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" xmi:id="_65FtWlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeMatcher" xmi:id="_65FtW1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ValueType_Enumeration" identifier="org.eclipse.papyrus.sysml.ValueType_Enumeration" name="SysML::ValueType_Enumeration" xmi:id="_65FtXFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/ValueType.gif" xmi:id="_65FtXVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" xmi:id="_65FtXlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypeEnumerationMatcher" xmi:id="_65FtX1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ValueType_PrimitiveType" identifier="org.eclipse.papyrus.sysml.ValueType_PrimitiveType" name="SysML::ValueType_PrimitiveType" xmi:id="_65FtYFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/blocks/ValueType.gif" xmi:id="_65FtYVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ValueTypeEditHelperAdvice" xmi:id="_65FtYlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ValueTypePrimitiveTypeMatcher" xmi:id="_65FtY1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::Verify" identifier="org.eclipse.papyrus.sysml.Verify" name="SysML::Verify" xmi:id="_65GUYFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/requirements/Verify.gif" xmi:id="_65GUYVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.VerifyEditHelperAdvice" xmi:id="_65GUYlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.VerifyMatcher" xmi:id="_65GUY1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::View" identifier="org.eclipse.papyrus.sysml.View" name="SysML::View" xmi:id="_65GUZFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/View.gif" xmi:id="_65GUZVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewEditHelperAdvice" xmi:id="_65GUZlYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewMatcher" xmi:id="_65GUZ1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ViewPoint" identifier="org.eclipse.papyrus.sysml.ViewPoint" name="SysML::ViewPoint" xmi:id="_65GUaFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.sysml" iconPath="/icons/modelelements/Viewpoint.gif" xmi:id="_65GUaVYBEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ViewPointEditHelperAdvice" xmi:id="_65GUalYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.ViewPointMatcher" xmi:id="_65GUa1YBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="SysML::ConstraintBlockParameter" identifier="org.eclipse.papyrus.sysml.ConstraintBlockParameter" name="SysML::ConstraintBlockParameter" xmi:id="_hoac0FYNEeSSidqjsigY_Q" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_2MWa8FYNEeSSidqjsigY_Q"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintParameterEditHelperAdvice" xmi:id="_pV9-YFYNEeSSidqjsigY_Q" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.sysml.service.types.matcher.NoMatcher" xmi:id="_4QgrEFYNEeSSidqjsigY_Q" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.ConstraintBlockPropertyEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.ConstraintBlockPropertyHelperAdvice" inheritance="all" xmi:id="_65IJkFYBEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ClassifierEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Classifier" inheritance="all" xmi:id="_Kse4IFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0z1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.BlockConnectorEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.BlockConnector" inheritance="all" target="_65DRElYBEeS0WsAAtVmToA" xmi:id="_XFKsEFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ConnectorEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Connector" inheritance="all" xmi:id="_iARuwFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC9VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PropertyEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Property" inheritance="all" xmi:id="_pCAFEFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.PackageEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Package" inheritance="all" xmi:id="_vpsKwFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.sysml.service.types.helper.advice.ActorEditHelperAdvice" identifier="org.eclipse.papyrus.sysml.advice.Actor" inheritance="all" xmi:id="_2t_7AFYDEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScV8UVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
index c34b3200766..13dde203aca 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/plugin.xml
@@ -369,56 +369,56 @@
 		</image>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-activities.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-allocations.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-blocks.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-constraints.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-modelelements.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-portsandflows.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml-requirements.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/sysml.elementtypesconfigurations">
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
index f42dd4a2ffb..dc0cb12bca6 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.11.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
  org.eclipse.xtend.lib;bundle-version="2.8.0",
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
  com.google.inject;bundle-version="3.0.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
  org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
  org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui;bundle-version="1.2.0"
+ org.eclipse.papyrus.uml.profile.types.generator.ui;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
index 8aec488df80..958c626bc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="popup:org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.generateMenu?after=additions">
+            locationURI="popup:org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu?after=additions">
          <command
                commandId="org.eclipse.papyrus.uml.profile.assistants.generator.ui.generateModelAssistants"
                id="org.eclipse.papyrus.uml.profile.assistants.generator.ui.generateModelAssistants"
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java
index e232bd2a5d4..e39d08a2a41 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/src/org/eclipse/papyrus/uml/profile/assistants/generator/ui/internal/wizards/GenerateAssistantsWizard.java
@@ -20,13 +20,13 @@ import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.util.AssistantResource;
 import org.eclipse.papyrus.uml.profile.assistants.generator.ModelingAssistantsGenerator;
 import org.eclipse.papyrus.uml.profile.assistants.generator.ui.internal.Activator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.AbstractGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ElementTypesGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards.GeneratorMainPage;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards.GeneratorWizard;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards.GeneratorWizardModel;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards.IGeneratorWizardPage;
+import org.eclipse.papyrus.uml.profile.types.generator.AbstractGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.ElementTypesGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards.GeneratorMainPage;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards.GeneratorWizard;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards.GeneratorWizardModel;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards.IGeneratorWizardPage;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.uml2.uml.Profile;
 
@@ -58,7 +58,7 @@ public class GenerateAssistantsWizard extends GeneratorWizard {
 	@Override
 	protected URI getOutputURI(AbstractGenerator<Profile, ?> generator, Identifiers identifiers, GeneratorWizardModel wizardModel) {
 		if (generator instanceof ElementTypesGenerator) {
-			return wizardModel.getOutputModelURI().trimFileExtension().appendFileExtension("elementtypesconfigurations");
+			return wizardModel.getOutputModelURI().trimFileExtension().appendFileExtension("typesconfigurations");
 		}
 
 		return super.getOutputURI(generator, identifiers, wizardModel);
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
index 7d676014e80..ef6af45fc25 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.11.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.xtend.lib;bundle-version="2.8.0",
  org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
  com.google.inject;bundle-version="3.0.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
  org.eclipse.papyrus.uml.filters;bundle-version="1.2.0"
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
index 378f5f0c559..7ebc4421897 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ConnectionAssistantRule.xtend
@@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.profile.assistants.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
 import org.eclipse.papyrus.infra.filters.Filter
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ConnectionAssistant
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ImpliedExtension
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers
+import org.eclipse.papyrus.uml.profile.types.generator.UML
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.ImpliedExtension
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 
 /**
  * Transformation rule for generating a {@link ConnectionAssistant} from a UML {@link Extension}.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
index 4fb746c6c44..3a08459ab4f 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/FiltersUtil.xtend
@@ -23,8 +23,8 @@ import org.eclipse.uml2.uml.Profile
 import org.eclipse.papyrus.uml.filters.UMLFiltersFactory
 import org.eclipse.emf.ecore.util.EcoreUtil
 import javax.inject.Inject
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.uml.profile.types.generator.UML
 
 /**
  * Utility extensions for working with {@link Filter}s.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
index 969258b07f8..8720b304b18 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/GeneratorModule.java
@@ -15,13 +15,13 @@ package org.eclipse.papyrus.uml.profile.assistants.generator;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantPackage;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.OutputModel;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.OutputModel;
 
 /**
  * The base Guice injector module for the UML Profile to Modeling Assistants transformation.
  */
-public class GeneratorModule extends org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.GeneratorModule {
+public class GeneratorModule extends org.eclipse.papyrus.uml.profile.types.generator.GeneratorModule {
 	public GeneratorModule(Identifiers identifiers) {
 		super(identifiers);
 	}
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
index e7db611a1d1..20a0a3a8eed 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantProviderRule.xtend
@@ -16,9 +16,9 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers
+import org.eclipse.papyrus.uml.profile.types.generator.UML
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
 import org.eclipse.uml2.uml.Profile
 
 /**
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
index 97f22f5686a..bdd9b6bba57 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/ModelingAssistantsGenerator.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.profile.assistants.generator;
 
 import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.AbstractGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.AbstractGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
 import org.eclipse.uml2.uml.Profile;
 
 import com.google.inject.Inject;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
index 7b95dd16dc6..76e34290c06 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator/src/org/eclipse/papyrus/uml/profile/assistants/generator/PopupAssistantRule.xtend
@@ -14,14 +14,14 @@ package org.eclipse.papyrus.uml.profile.assistants.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 import org.eclipse.papyrus.infra.filters.Filter
 import org.eclipse.papyrus.infra.gmfdiag.assistant.AssistantFactory
 import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UML
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.UMLElementTypes
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ImpliedExtension
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers
+import org.eclipse.papyrus.uml.profile.types.generator.UML
+import org.eclipse.papyrus.uml.profile.types.generator.UMLElementTypes
+import org.eclipse.papyrus.uml.profile.types.generator.ImpliedExtension
 
 /**
  * Transformation rule for generating a {@link PopupAssistant} from a UML {@link Extension}.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.classpath b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.classpath
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.classpath
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
index a626ff98979..4e3786687a1 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.project
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui</name>
+	<name>org.eclipse.papyrus.uml.profile.types.generator.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
index d5c9bf17450..cbb2d4def1b 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/META-INF/MANIFEST.MF
@@ -1,35 +1,35 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.xtend.lib.macro;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
- org.eclipse.ui;bundle-version="3.107.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.10.100",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal,
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.handlers,
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;x-friends:="org.eclipse.papyrus.uml.profile.assistants.generator.ui"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore;bundle-version="2.11.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",

+ org.eclipse.uml2.uml;bundle-version="5.1.0",

+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",

+ org.eclipse.xtend.lib;bundle-version="2.8.0",

+ org.eclipse.xtend.lib.macro;bundle-version="2.8.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

+ com.google.inject;bundle-version="3.0.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",

+ org.eclipse.ui;bundle-version="3.107.0",

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

+ org.eclipse.ui.ide;bundle-version="3.10.100",

+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

+Export-Package: org.eclipse.papyrus.uml.profile.types.generator.ui.internal,

+ org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers,

+ org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;x-friends:="org.eclipse.papyrus.uml.profile.assistants.generator.ui"

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator

+Bundle-Description: %pluginDescription

+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.ui;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/about.html b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/about.html
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/about.html
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/build.properties b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
index 31c15b846e8..31c15b846e8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/build.properties
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/build.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/icons/full/obj16/plugin.gif b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/plugin.gif
index 8493df40dfe..8493df40dfe 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/icons/full/obj16/plugin.gif
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/plugin.gif
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/icons/full/obj16/project.png b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/project.png
index 154776ea14e..154776ea14e 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/icons/full/obj16/project.png
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/icons/full/obj16/project.png
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/plugin.properties b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
index 3ff1edb84b8..3ff1edb84b8 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/plugin.properties
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/plugin.xml b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
index d62afe03d0e..9953366b8ba 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/plugin.xml
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
@@ -8,10 +8,10 @@
             locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=tools">
          <menu
                label="Generate Tooling Model"
-               id="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.generateMenu">
+               id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu">
             <command
-                  commandId="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.generateElementTypes"
-                  id="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.generateElementTypes"
+                  commandId="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes"
+                  id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes"
                   label="Element Types..."
                   style="push">
                <visibleWhen
@@ -42,9 +42,9 @@
    <extension
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.handlers.GenerateElementTypesHandler"
+            defaultHandler="org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers.GenerateElementTypesHandler"
             description="Launch a wizard for generation of an Element Type Configurations model for the selected UML profile"
-            id="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.generateElementTypes"
+            id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes"
             name="Generate Element Types Model">
       </command>
    </extension>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/pom.xml b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml
index 5ca9bc8f127..bb8f47eb822 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/pom.xml
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/pom.xml
@@ -6,7 +6,7 @@
 	    <artifactId>org.eclipse.papyrus.uml-assistants</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui</artifactId>
+	<artifactId>org.eclipse.papyrus.uml.profile.types.generator.ui</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/Activator.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/Activator.java
index fa5ea6808b4..79fa26470e0 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/Activator.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Christian W. Damus - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.papyrus.infra.core.log.LogHelper;
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
  * This is the central singleton for the UML Profile Element Types Generator UI plugin.
  */
 public final class Activator extends AbstractUIPlugin {
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.profile.types.generator.ui"; //$NON-NLS-1$
 
 	/**
 	 * Keep track of the singleton.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/handlers/GenerateElementTypesHandler.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/handlers/GenerateElementTypesHandler.java
index 0ce7061198d..639b7dcb2a4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/handlers/GenerateElementTypesHandler.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/handlers/GenerateElementTypesHandler.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.handlers;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards.GeneratorWizard;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards.GeneratorWizard;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.uml2.uml.Profile;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/BaseElementTypeSetBlock.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
index f7a5feed26d..c2258bf4ae6 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/BaseElementTypeSetBlock.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.resource.JFaceResources;
@@ -28,9 +28,9 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.Activator;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorMainPage.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorMainPage.java
index 1e0102b2e52..25b18ab5871 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorMainPage.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorMainPage.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorParametersBlock.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorParametersBlock.java
index 61ee04ac291..212a61dda0c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorParametersBlock.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorParametersBlock.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static org.eclipse.uml2.common.util.UML2Util.getValidJavaIdentifier;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorWizard.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizard.java
index ef8f57d5510..5a7eb4df5d7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorWizard.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizard.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
@@ -28,10 +28,10 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.ui.util.UIUtil;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.AbstractGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ElementTypesGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.Activator;
+import org.eclipse.papyrus.uml.profile.types.generator.AbstractGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.ElementTypesGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.ui.internal.Activator;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.ide.IDE;
@@ -71,7 +71,7 @@ public class GeneratorWizard extends Wizard {
 	}
 
 	protected IGeneratorWizardPage createMainPage(GeneratorWizardModel model) {
-		return new GeneratorMainPage(model, "Element Types Configuration Model", "Enter details of the element types model to generate.", "elementtypesconfigurations");
+		return new GeneratorMainPage(model, "Element Types Configuration Model", "Enter details of the element types model to generate.", "typesconfigurations");
 	}
 
 	private void save() {
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorWizardModel.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizardModel.java
index d06f56d05ad..204b3fb11df 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/GeneratorWizardModel.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/GeneratorWizardModel.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/IGeneratorWizardPage.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/IGeneratorWizardPage.java
index 341854645ed..c7be545b3e2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ui/internal/wizards/IGeneratorWizardPage.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/src/org/eclipse/papyrus/uml/profile/types/generator/ui/internal/wizards/IGeneratorWizardPage.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui.internal.wizards;
+package org.eclipse.papyrus.uml.profile.types.generator.ui.internal.wizards;
 
 import org.eclipse.jface.wizard.IWizardPage;
 
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.classpath b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath
index 3e8bd41bf6b..3e8bd41bf6b 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.classpath
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.classpath
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.project b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
index 01d3cd62461..9890647cdf6 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.project
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator</name>
+	<name>org.eclipse.papyrus.uml.profile.types.generator</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.settings/org.eclipse.xtend.core.Xtend.prefs b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
index 110a6e417d3..110a6e417d3 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/.settings/org.eclipse.xtend.core.Xtend.prefs
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/META-INF/MANIFEST.MF b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
index 6c121be4efc..3b18f830ec2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.11.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0",
- org.eclipse.xtend.lib;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.inject;bundle-version="3.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator,
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.internal;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.internal.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore;bundle-version="2.11.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.uml2.uml;bundle-version="5.1.0",

+ org.eclipse.xtend.lib;bundle-version="2.8.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

+ com.google.inject;bundle-version="3.0.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0"

+Export-Package: org.eclipse.papyrus.uml.profile.types.generator,

+ org.eclipse.papyrus.uml.profile.types.generator.internal;x-internal:=true

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.profile.types.generator.internal.Activator

+Bundle-Description: %pluginDescription

+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/about.html b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/about.html
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/about.html
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/build.properties b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
index 5cfa9579cf0..5cfa9579cf0 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/build.properties
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/build.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/plugin.properties b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
index a65abd84a2e..a65abd84a2e 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/plugin.properties
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/plugin.properties
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/pom.xml b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml
index 595eae488fc..055ce27b9d6 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/pom.xml
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/pom.xml
@@ -6,7 +6,7 @@
 	    <artifactId>org.eclipse.papyrus.uml-assistants</artifactId>
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator</artifactId>
+	<artifactId>org.eclipse.papyrus.uml.profile.types.generator</artifactId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
@@ -47,4 +47,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/AbstractGenerator.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/AbstractGenerator.java
index e2a92877720..3dfe2472595 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/AbstractGenerator.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/AbstractGenerator.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;
+package org.eclipse.papyrus.uml.profile.types.generator;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.internal.Activator;
+import org.eclipse.papyrus.uml.profile.types.generator.internal.Activator;
 import org.eclipse.uml2.common.util.UML2Util;
 
 import com.google.common.base.Strings;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ApplyStereotypeAdviceRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
index 486d8ac81ab..7619fed8c3f 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ApplyStereotypeAdviceRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ApplyStereotypeAdviceRule.xtend
@@ -10,21 +10,20 @@
  *   Christian W. Damus - Initial API and implementation
  *   
  *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
 import org.eclipse.uml2.uml.Stereotype
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory
 
 /**
  * Transformation rule for generating an {@link ApplyStereotypeAdviceConfiguration} from a UML {@link Stereotype}.
  */
 @Singleton
 class ApplyStereotypeAdviceRule {
-    static extension ApplyStereotypeAdviceConfigurationFactory applyStereotypeAdviceConfigurationFactory = ApplyStereotypeAdviceConfigurationFactory.
+    static extension ApplyStereotypeAdviceFactory applyStereotypeAdviceConfigurationFactory = ApplyStereotypeAdviceFactory.
         eINSTANCE
 
     @Inject extension ElementTypeRule
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ConfigurationSetRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend
index ff849b75271..ccb28f016c6 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ConfigurationSetRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ConfigurationSetRule.xtend
@@ -10,24 +10,24 @@
  *   Christian W. Damus - Initial API and implementation
  *   Benoit Maggi       - #474408 : order by identifier the generated file   
  *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import java.util.List
 import javax.inject.Inject
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration
 import org.eclipse.uml2.uml.Profile
 import org.eclipse.uml2.uml.UMLPackage
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory
 
 /**
  * Transformation rule for generating an {@link ElementTypeSetConfiguration} from a UML {@link Profile}.
  */
 @Singleton
 class ConfigurationSetRule {
-    static extension ElementtypesconfigurationsFactory elementtypesconfigurationsFactory = ElementtypesconfigurationsFactory.
+    static extension ElementTypesConfigurationsFactory elementtypesconfigurationsFactory = ElementTypesConfigurationsFactory.
         eINSTANCE
 
     @Inject extension Identifiers
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypeRule.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend
index 99878ba8f53..9d37c8f1844 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypeRule.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypeRule.xtend
@@ -10,29 +10,30 @@
  *   Christian W. Damus - Initial API and implementation
  *   
  *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
 import org.eclipse.core.resources.ResourcesPlugin
 import org.eclipse.emf.common.util.URI
 import org.eclipse.emf.ecore.EObject
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory
+
 import org.eclipse.uml2.uml.Stereotype
 
 import static extension org.eclipse.emf.common.util.URI.decode
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherFactory
 
 /**
  * Transformation rule for generating a {@link SpecializationTypeConfiguration} from a UML metaclass {@link Extension}.
  */
 @Singleton
 class ElementTypeRule {
-    static extension ElementtypesconfigurationsFactory elementtypesconfigurationsFactory = ElementtypesconfigurationsFactory.
+    static extension ElementTypesConfigurationsFactory elementtypesconfigurationsFactory = ElementTypesConfigurationsFactory.
         eINSTANCE
-    static extension StereotypeApplicationMatcherConfigurationFactory stereotypeApplicationMatcherConfigurationFactory = StereotypeApplicationMatcherConfigurationFactory.
+    static extension StereotypeApplicationMatcherFactory stereotypeApplicationMatcherConfigurationFactory = StereotypeApplicationMatcherFactory.
         eINSTANCE
 
     @Inject extension UMLElementTypes
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypesGenerator.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypesGenerator.java
index 39c707ed966..e300a7d62f5 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ElementTypesGenerator.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ElementTypesGenerator.java
@@ -11,9 +11,9 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;
+package org.eclipse.papyrus.uml.profile.types.generator;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.uml2.uml.Profile;
 
 import com.google.inject.Inject;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/GeneratorModule.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/GeneratorModule.java
index 6b27f93dd97..1a69f63f9c7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/GeneratorModule.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/GeneratorModule.java
@@ -11,10 +11,10 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;
+package org.eclipse.papyrus.uml.profile.types.generator;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.uml2.uml.UMLPackage;
 
 import com.google.inject.AbstractModule;
@@ -52,7 +52,7 @@ public class GeneratorModule extends AbstractModule {
 	}
 
 	protected void bindOutputType() {
-		bind(EClass.class).annotatedWith(OutputModel.class).toInstance(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
+		bind(EClass.class).annotatedWith(OutputModel.class).toInstance(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
 	}
 
 	protected void bindIdentifiers() {
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/Identifiers.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend
index 5c0a0bf4306..17693cbbdbe 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/Identifiers.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/Identifiers.xtend
@@ -10,16 +10,16 @@
  *   Christian W. Damus - Initial API and implementation
  *   
  *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import static extension org.eclipse.uml2.common.util.UML2Util.getValidJavaIdentifier
 
 import org.eclipse.xtend.lib.annotations.Accessors
 import javax.inject.Singleton
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration
 import javax.inject.Inject
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration
 import org.eclipse.emf.common.notify.AdapterFactory
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.edit.provider.IItemLabelProvider
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ImpliedExtension.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend
index aaac942b81c..97cc26e94e2 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/ImpliedExtension.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/ImpliedExtension.xtend
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import org.eclipse.xtend.lib.annotations.Data
 import org.eclipse.uml2.uml.Class
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/InputModel.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/InputModel.java
index 76ffd1e2ec1..08eb000227a 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/InputModel.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/InputModel.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;
+package org.eclipse.papyrus.uml.profile.types.generator;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/OutputModel.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/OutputModel.java
index a32889685e7..50b34bb4a98 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/OutputModel.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/OutputModel.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;
+package org.eclipse.papyrus.uml.profile.types.generator;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UML.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend
index 14e4660082e..3befa66d888 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UML.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UML.xtend
@@ -10,7 +10,7 @@
  *   Christian W. Damus - Initial API and implementation
  *   
  *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import static org.eclipse.uml2.uml.UMLPackage.Literals.*
 
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UMLElementTypes.xtend b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend
index 47dae5a4a72..38c844db6f9 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/UMLElementTypes.xtend
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/UMLElementTypes.xtend
@@ -10,7 +10,7 @@
  *   Christian W. Damus - Initial API and implementation
  *   
  *****************************************************************************/
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator
+package org.eclipse.papyrus.uml.profile.types.generator
 
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -19,15 +19,15 @@ import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry
 import org.eclipse.gmf.runtime.emf.type.core.IElementType
 import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsFactory
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry
-import org.eclipse.papyrus.infra.elementtypesconfigurations.MetamodelTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration
+import org.eclipse.papyrus.infra.types.IconEntry
+import org.eclipse.papyrus.infra.types.MetamodelTypeConfiguration
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry
 import org.eclipse.uml2.uml.Class
 import org.eclipse.uml2.uml.UMLPackage
 import java.util.regex.Pattern
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsFactory
 
 /**
  * Utility extensions for working with and generating objects for the base UML element types specialized by the profile.
@@ -36,7 +36,7 @@ import java.util.regex.Pattern
 class UMLElementTypes {
     private static final Pattern VISUAL_ID_PATTERN = Pattern.compile("\\d{4}");
     
-    static extension ElementtypesconfigurationsFactory elementtypesconfigurationsFactory = ElementtypesconfigurationsFactory.
+    static extension ElementTypesConfigurationsFactory elementtypesconfigurationsFactory = ElementTypesConfigurationsFactory.
         eINSTANCE
 
     @Inject extension Identifiers
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/internal/Activator.java b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/internal/Activator.java
index aea9e7f6618..d7461b9aa10 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/internal/Activator.java
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/src/org/eclipse/papyrus/uml/profile/types/generator/internal/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:
  *   Christian W. Damus - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.internal;
+package org.eclipse.papyrus.uml.profile.types.generator.internal;
 
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.papyrus.infra.core.log.LogHelper;
@@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext;
  * This is the central singleton for the UML Profile Element Types Configuration ElementTypesGenerator plugin.
  */
 public final class Activator extends Plugin {
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.profile.types.generator"; //$NON-NLS-1$
 
 	/**
 	 * Keep track of the singleton.
diff --git a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/xtend-gen/.gitignore b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/xtend-gen/.gitignore
index ee1d87867e7..ee1d87867e7 100644
--- a/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/xtend-gen/.gitignore
+++ b/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator/xtend-gen/.gitignore
diff --git a/plugins/uml/assistants/pom.xml b/plugins/uml/assistants/pom.xml
index 016970135ff..83c34c3e619 100644
--- a/plugins/uml/assistants/pom.xml
+++ b/plugins/uml/assistants/pom.xml
@@ -14,7 +14,7 @@
 	<modules>
 		<module>org.eclipse.papyrus.uml.profile.assistants.generator</module>
 		<module>org.eclipse.papyrus.uml.profile.assistants.generator.ui</module>
-		<module>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator</module>
-		<module>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui</module>
+		<module>org.eclipse.papyrus.uml.profile.types.generator</module>
+		<module>org.eclipse.papyrus.uml.profile.types.generator.ui</module>
 	</modules>
 </project>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
index 951decedc43..0e799e67ec8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
@@ -1,761 +1,761 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.activity.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLActivityDiagram" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" xmi:version="2.0">
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063" name="Accept Event Action" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3016" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3016" name="Action Input Pin" xmi:id="_x8G0cWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0cmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3018" name="Action Input Pin" xmi:id="_x8G0e2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0fGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3021" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3021" name="Action Input Pin" xmi:id="_x8G0g2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0hGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3026" name="Action Input Pin" xmi:id="_x8G0jWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0jmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3047" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3047" name="Action Input Pin" xmi:id="_x8G0r2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0sGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3050" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3050" name="Action Input Pin" xmi:id="_x8G0tWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0tmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3053" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3053" name="Action Input Pin" xmi:id="_x8G0u2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0vGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3061" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3061" name="Action Input Pin" xmi:id="_x8G0w2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0xGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3005" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005" name="Activity Final Node" xmi:id="_x8G0aWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif" xmi:id="_x8G0amaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityFinalNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059" name="Activity Parameter Node" xmi:id="_x8G0x2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_x8G0yGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067" name="Activity Partition" xmi:id="_x8HbiGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_x8HbiWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_2001" name="Activity" xmi:id="_x8HbvmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_x8Hbv2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3083" identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_3083" name="Activity" xmi:id="_x8HbkmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_x8Hbk2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3091" identifier="org.eclipse.papyrus.uml.diagram.activity.AddStructuralFeatureValueAction_3091" name="Add Structural Feature Value Action" xmi:id="_x8HboGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" xmi:id="_x8HboWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AddStructuralFeatureValueAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3099" identifier="org.eclipse.papyrus.uml.diagram.activity.AddVariableValueAction_3099" name="Add Variable Value Action" xmi:id="_x8HbsGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddVariableValueAction.gif" xmi:id="_x8HbsWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AddVariableValueAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3102" identifier="org.eclipse.papyrus.uml.diagram.activity.BroadcastSignalAction_3102" name="Broadcast Signal Action" xmi:id="_x8HbtmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" xmi:id="_x8Hbt2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BroadcastSignalAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008" name="Call Behavior Action" xmi:id="_x8G0d2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_x8G0eGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010" name="Call Operation Action" xmi:id="_x8G0gWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_x8G0gmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3104" identifier="org.eclipse.papyrus.uml.diagram.activity.CentralBufferNode_3104" name="Central Buffer Node" xmi:id="_x8HbumaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CentralBufferNode.gif" xmi:id="_x8Hbu2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CentralBufferNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.uml.diagram.activity.Comment_3080" name="Comment" xmi:id="_x8HbjGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_x8HbjWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3069" identifier="org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069" name="Conditional Node" xmi:id="_x8HbcmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif" xmi:id="_x8Hbc2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ConditionalNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3002" name="Constraint" xmi:id="_x8G0Y2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0ZGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3003" name="Constraint" xmi:id="_x8G0ZWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0ZmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3011" name="Constraint" xmi:id="_x8G0nWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0nmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3012" name="Constraint" xmi:id="_x8G0n2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0oGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3112" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3112" name="Constraint" xmi:id="_x8HbvGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8HbvWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004" name="Control Flow" xmi:id="_x8HbwmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_x8Hbw2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3198" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkObjectAction_3198" name="Create Link Object Action" xmi:id="_Wjfh8OGmEeSvI9YIOwR8Lw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" xmi:id="_Wjfh8eGmEeSvI9YIOwR8Lw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CreateLinkObjectAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3086" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateObjectAction_3086" name="Create Object Action" xmi:id="_x8HblGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateObjectAction.gif" xmi:id="_x8HblWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CreateObjectAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078" name="Data Store Node" xmi:id="_x8G0qWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_x8G0qmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038" name="Decision Node" xmi:id="_x8G0oWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_x8G0omaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3095" identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyObjectAction_3095" name="Destroy Object Action" xmi:id="_x8HbqGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyObjectAction.gif" xmi:id="_x8HbqWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DestroyObjectAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3034" identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3034" name="Duration Constraint" xmi:id="_x8G0kWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_x8G0kmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3035" identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3035" name="Duration Constraint" xmi:id="_x8G0k2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_x8G0lGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005" name="Exception Handler" xmi:id="_x8HbxGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExceptionHandler.gif" xmi:id="_x8HbxWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExceptionHandler</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3074" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074" name="Expansion Node" xmi:id="_x8HbdmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_x8Hbd2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3075" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075" name="Expansion Node" xmi:id="_x8HbeGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_x8HbeWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070" name="Expansion Region" xmi:id="_x8HbdGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_x8HbdWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionRegion</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006" name="Flow Final Node" xmi:id="_x8G0a2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_x8G0bGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040" name="Fork Node" xmi:id="_x8G0pWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_x8G0pmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004" name="Initial Node" xmi:id="_x8G0Z2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_x8G0aGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3013" name="Input Pin" xmi:id="_x8G0c2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0dGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3019" name="Input Pin" xmi:id="_x8G0fWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0fmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3023" name="Input Pin" xmi:id="_x8G0h2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0iGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3027" name="Input Pin" xmi:id="_x8G0j2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0kGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3048" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3048" name="Input Pin" xmi:id="_x8G0sWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0smaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3051" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3051" name="Input Pin" xmi:id="_x8G0t2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0uGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3055" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3055" name="Input Pin" xmi:id="_x8G0v2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0wGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3062" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3062" name="Input Pin" xmi:id="_x8G0xWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0xmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3089" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3089" name="Input Pin" xmi:id="_x8HbnGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbnWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3092" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3092" name="Input Pin" xmi:id="_x8HbomaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbo2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3093" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3093" name="Input Pin" xmi:id="_x8HbpGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbpWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3096" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3096" name="Input Pin" xmi:id="_x8HbqmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbq2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3100" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3100" name="Input Pin" xmi:id="_x8HbsmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbs2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3101" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3101" name="Input Pin" xmi:id="_x8HbtGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbtWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3103" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3103" name="Input Pin" xmi:id="_x8HbuGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbuWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3105" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3105" name="Input Pin" xmi:id="_x8HbhmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbh2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3068" identifier="org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068" name="Interruptible Activity Region" xmi:id="_x8HbimaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_x8Hbi2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InterruptibleActivityRegion</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3032" identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3032" name="Interval Constraint" xmi:id="_x8G0mWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_x8G0mmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3033" identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3033" name="Interval Constraint" xmi:id="_x8G0m2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_x8G0nGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041" name="Join Node" xmi:id="_x8G0p2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_x8G0qGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071" name="Loop Node" xmi:id="_x8HbemaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_x8Hbe2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LoopNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3039" identifier="org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039" name="Merge Node" xmi:id="_x8G0o2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_x8G0pGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3085" identifier="org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085" name="Shape Named Element" xmi:id="_x8HbmGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_x8HbmWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003" name="Object Flow" xmi:id="_x8HbwGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_x8HbwWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007" name="Opaque Action" xmi:id="_x8G0bWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_x8G0bmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014" name="Output Pin" xmi:id="_x8G0dWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0dmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020" name="Output Pin" xmi:id="_x8G0f2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0gGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3024" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024" name="Output Pin" xmi:id="_x8G0iWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0imaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3064" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064" name="Output Pin" xmi:id="_x8G0y2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0zGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077" name="Output Pin" xmi:id="_x8HbcGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbcWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3084" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084" name="Output Pin" xmi:id="_x8HbkGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbkWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3087" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087" name="Output Pin" xmi:id="_x8HblmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbl2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3090" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090" name="Output Pin" xmi:id="_x8HbnmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbn2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3094" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094" name="Output Pin" xmi:id="_x8HbpmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbp2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3098" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098" name="Output Pin" xmi:id="_x8HbrmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbr2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3109" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109" name="Output Pin" xmi:id="_x8HbfGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbfWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3110" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3110" name="Output Pin" xmi:id="_x8HbfmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbf2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3111" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111" name="Output Pin" xmi:id="_x8HbgGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbgWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" identifier="org.eclipse.papyrus.uml.diagram.activity.Parameter_3001" name="Parameter" xmi:id="_x8G0YWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_x8G0YmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3081" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadSelfAction_3081" name="Read Self Action" xmi:id="_x8HbjmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadSelfAction.gif" xmi:id="_x8Hbj2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReadSelfAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3088" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadStructuralFeatureAction_3088" name="Read Structural Feature Action" xmi:id="_x8HbmmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" xmi:id="_x8Hbm2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReadStructuralFeatureAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3097" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadVariableAction_3097" name="Read Variable Action" xmi:id="_x8HbrGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadVariableAction.gif" xmi:id="_x8HbrWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReadVariableAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042" name="Send Object Action" xmi:id="_x8G0q2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_x8G0rGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.SendObjectAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3052" identifier="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052" name="Send Signal Action" xmi:id="_x8G0uWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendSignalAction.gif" xmi:id="_x8G0umaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.SendSignalAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3073" identifier="org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073" name="Sequence Node" xmi:id="_x8HbgmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif" xmi:id="_x8Hbg2aNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.SequenceNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065" name="Structured Activity Node" xmi:id="_x8HbhGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_x8HbhWaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3036" identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3036" name="Time Constraint" xmi:id="_x8G0lWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_x8G0lmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3037" identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3037" name="Time Constraint" xmi:id="_x8G0l2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_x8G0mGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3015" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3015" name="Value Pin" xmi:id="_x8G0b2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0cGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3017" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3017" name="Value Pin" xmi:id="_x8G0eWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0emaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3022" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3022" name="Value Pin" xmi:id="_x8G0hWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0hmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3025" name="Value Pin" xmi:id="_x8G0i2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0jGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3046" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3046" name="Value Pin" xmi:id="_x8G0rWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0rmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3049" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3049" name="Value Pin" xmi:id="_x8G0s2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0tGaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3054" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3054" name="Value Pin" xmi:id="_x8G0vWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0vmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3060" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3060" name="Value Pin" xmi:id="_x8G0wWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0wmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3076" identifier="org.eclipse.papyrus.uml.diagram.activity.ValueSpecificationAction_3076" name="Value Specification Action" xmi:id="_x8G0zWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" xmi:id="_x8G0zmaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValueSpecificationAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLActivityDiagram" identifier="org.eclipse.papyrus.uml.diagram.activity.Package_1000" name="Package" xmi:id="_q-4csL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_q-5DwL02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3192" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3192" name="Value Pin" xmi:id="_rAPHkL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAPHkb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3193" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3193" name="Action Input Pin" xmi:id="_rAPuoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAPuob02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3188" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3188" name="Input Pin" xmi:id="_rAVOML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rAVOMb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3189" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3189" name="Value Pin" xmi:id="_rAWcUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAWcUb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3203" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3203" name="Value Pin" xmi:id="_9dDiROsXEeS3WOZTeAfQLw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_9dDiResXEeS3WOZTeAfQLw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3190" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3190" name="Action Input Pin" xmi:id="_rAXqcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAXqcb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3191" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3191" name="Output Pin" xmi:id="_rAYRgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rAYRgb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3181" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3181" name="Input Pin" xmi:id="_rAm7AL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rAm7Ab02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3182" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3182" name="Value Pin" xmi:id="_rAoJIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAoJIb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3183" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3183" name="Value Pin" xmi:id="_rAowML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAowMb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3184" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3184" name="Value Pin" xmi:id="_rAp-UL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAp-Ub02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3185" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3185" name="Action Input Pin" xmi:id="_rArMcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rArMcb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3186" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3186" name="Action Input Pin" xmi:id="_rArzgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rArzgb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3187" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3187" name="Action Input Pin" xmi:id="_rAtBoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAtBob02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3173" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3173" name="Value Pin" xmi:id="_rAwsAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAwsAb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3174" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3174" name="Action Input Pin" xmi:id="_rAxTEL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAxTEb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3175" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3175" name="Value Pin" xmi:id="_rA3ZsL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rA3Zsb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3176" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3176" name="Value Pin" xmi:id="_rA4AwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rA4Awb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3177" identifier="org.eclipse.papyrus.uml.diagram.activity.ActoinInputPin_3177" name="Actoin Input Pin" xmi:id="_rA5O4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rA5O4b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3178" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3178" name="Action Input Pin" xmi:id="_rA518L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rA518b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3179" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3179" name="Value Pin" xmi:id="_rA85QL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rA85Qb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3180" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3180" name="Action Input Pin" xmi:id="_rA-HYL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rA-HYb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3113" identifier="org.eclipse.papyrus.uml.diagram.activity.StartObjectBehaviorAction_3113" name="Start Object Behaviour Action" xmi:id="_rBAjoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" xmi:id="_rBAjob02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StartObjectBehaviorAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3125" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3125" name="Output Pin" xmi:id="_rBBxwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBBxwb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3132" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3132" name="Input Pin" xmi:id="_rBC_4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBC_4b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3145" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3145" name="Value Pin" xmi:id="_rBDm8L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBDm8b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3158" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3158" name="Action Input Pin" xmi:id="_rBE1EL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBE1Eb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3133" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3133" name="Input Pin" xmi:id="_rBFcIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBGDML02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3146" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3146" name="Value Pin" xmi:id="_rBGqQL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBGqQb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3159" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3159" name="Action Input Pin" xmi:id="_rBH4YL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBH4Yb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3114" identifier="org.eclipse.papyrus.uml.diagram.activity.TestIdentityAction_3114" name="Test Identity Action" xmi:id="_rBIfcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TestIdentityAction.gif" xmi:id="_rBIfcb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TestIdentityAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3126" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3126" name="Output Pin" xmi:id="_rBJtkL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBJtkb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3134" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3134" name="Input Pin" xmi:id="_rBK7sL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBK7sb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3135" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3135" name="Input Pin" xmi:id="_rBMJ0L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBMJ0b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3147" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3147" name="Value Pin" xmi:id="_rBMw4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBMw4b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3148" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3148" name="Value Pin" xmi:id="_rBN_AL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBN_Ab02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3160" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3160" name="Action Input Pin" xmi:id="_rBPNIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBPNIb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3161" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3161" name="Action Input Pin" xmi:id="_rBQbQL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBQbQb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3115" identifier="org.eclipse.papyrus.uml.diagram.activity.ClearStructuralFeatureAction_3115" name="Clear Structural Feature Action" xmi:id="_rBRCUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" xmi:id="_rBRCUb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ClearStructuralFeatureAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3127" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3127" name="Output Pin" xmi:id="_rBSQcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBSQcb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3136" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3136" name="Input Pin" xmi:id="_rBTekL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBTekb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3149" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3149" name="Value Pin" xmi:id="_rBUssL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBUssb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3162" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3162" name="Action Input Pin" xmi:id="_rBVTwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBVTwb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3117" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkAction_3117" name="Create Link Action" xmi:id="_rBWh4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkAction.gif" xmi:id="_rBWh4b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CreateLinkAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3137" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3137" name="Input Pin" xmi:id="_rBXwAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBXwAb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3151" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3151" name="Value Pin" xmi:id="_rBY-IL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBY-Ib02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3163" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3163" name="Action Input Pin" xmi:id="_rBZlML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBZlMb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3116" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadLinkAction_3116" name="Read Link Action" xmi:id="_rBazUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkAction.gif" xmi:id="_rBazUb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReadLinkAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3128" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3128" name="Output Pin" xmi:id="_rBcBcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBcBcb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3138" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3138" name="Input Pin" xmi:id="_rBdPkL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBdPkb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3150" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3150" name="Value Pin" xmi:id="_rBedsL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBedsb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3164" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3164" name="Action Input Pin" xmi:id="_rBfEwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBfEwb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3118" identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyLinkAction_3118" name="Destroy Link Action" xmi:id="_rBgS4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyLinkAction.gif" xmi:id="_rBgS4b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DestroyLinkAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3139" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3139" name="Input Pin" xmi:id="_rBhhAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBhhAb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3152" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3152" name="Value Pin" xmi:id="_rBivIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBivIb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3165" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3165" name="Action Input Pin" xmi:id="_rBjWML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBjWMb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3119" identifier="org.eclipse.papyrus.uml.diagram.activity.ClearAssociationAction_3119" name="Clear Assotiation Action" xmi:id="_rBkkUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearAssociationAction.gif" xmi:id="_rBkkUb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ClearAssociationAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3140" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3140" name="Input Pin" xmi:id="_rBlycL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBlycb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3153" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3153" name="Value Pin" xmi:id="_rBmZgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBmZgb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3166" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3166" name="Action Input Pin" xmi:id="_rBnnoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBnnob02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3120" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadExtentAction_3120" name="Read Extent Action" xmi:id="_rBo1wL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadExtentAction.gif" xmi:id="_rBo1wb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReadExtentAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3129" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3129" name="Output Pin" xmi:id="_rBqD4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBqD4b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3121" identifier="org.eclipse.papyrus.uml.diagram.activity.ReclassifyObjectAction_3121" name="Reclassify Object Action" xmi:id="_rBqq8L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" xmi:id="_rBqq8b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReclassifyObjectAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3141" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3141" name="Input Pin" xmi:id="_rBr5EL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBr5Eb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3154" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3154" name="Value Pin" xmi:id="_rBtHML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBtHMb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3167" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3167" name="Action Input Pin" xmi:id="_rBtuQL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBuVUL02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3122" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadIsClassifiedObjectAction_3122" name="Read Is Classified Object Action" xmi:id="_rBu8YL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" xmi:id="_rBu8Yb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3130" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3130" name="Output Pin" xmi:id="_rBwKgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBwKgb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3142" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3142" name="Input Pin" xmi:id="_rBxYoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBxYob02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3155" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3155" name="Value Pin" xmi:id="_rBx_sL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBx_sb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3168" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3168" name="Action Input Pin" xmi:id="_rBzN0L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBzN0b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3123" identifier="org.eclipse.papyrus.uml.diagram.activity.ReduceAction_3123" name="Reduce Action" xmi:id="_rBz04L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReduceAction.gif" xmi:id="_rBz04b02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ReduceAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3131" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3131" name="Output Pin" xmi:id="_rB1DAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rB1DAb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3202" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3202" name="Output Pin" xmi:id="_gx2kouGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_gx2ko-GsEeSijulVpZaadA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3143" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3143" name="Input Pin" xmi:id="_rB2RIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rB2RIb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3156" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3156" name="Value Pin" xmi:id="_rB24ML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rB24Mb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3169" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3169" name="Action Input Pin" xmi:id="_rB4GUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rB4GUb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3124" identifier="org.eclipse.papyrus.uml.diagram.activity.StartClassifierBehaviorAction_3124" name="Start Classifier Behaviour Action" xmi:id="_rB4tYL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" xmi:id="_rB4tYb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StartClassifierBehaviorAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3144" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3144" name="Input Pin" xmi:id="_rB57gL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rB57gb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3199" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3199" name="Input Pin" xmi:id="_gx19kOGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_gx19keGsEeSijulVpZaadA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3157" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3157" name="Value Pin" xmi:id="_rB6ikL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rB6ikb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3200" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3200" name="Value Pin" xmi:id="_gx19kuGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_gx19k-GsEeSijulVpZaadA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3170" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3170" name="Action Input Pin" xmi:id="_rB7wsL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rB7wsb02EeSUmeqld4lnBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3201" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3201" name="Action Input Pin" xmi:id="_gx2koOGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_gx2koeGsEeSijulVpZaadA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPrecondition_4001" name="Action Local Precondition" xmi:id="_rB8-0L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3204" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionPin_3204" name="Action Pin" xmi:id="_9dEJUOsXEeS3WOZTeAfQLw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_9dEJUesXEeS3WOZTeAfQLw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPostcondition_4002" name="Action Local Postcondition" xmi:id="_rB8-0b02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006" name="Comment Annotated Element" xmi:id="_rCACIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.activity.ConstraintConstrainedElement_4007" name="Constraint Constrained Element" xmi:id="_rCACIb02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations description="" identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType" name="Call Behavior Action Base" xmi:id="_N5AjYOnQEeSdwvyVD4uXcQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_N5AjYenQEeSdwvyVD4uXcQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallBehaviorAction</specializedTypesID>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" target="_x8G0d2aNEeSyJIsxLao1Pw" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" target="_x8G0gWaNEeSyJIsxLao1Pw" xmi:id="_9UmhMGaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" target="_x8G0uWaNEeSyJIsxLao1Pw" xmi:id="_Eu2FMGaPEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.activity.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLActivityDiagram" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" xmi:version="2.0">

+  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063" name="Accept Event Action" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AcceptEventAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3016" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3016" name="Action Input Pin" xmi:id="_x8G0cWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0cmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3018" name="Action Input Pin" xmi:id="_x8G0e2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0fGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3021" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3021" name="Action Input Pin" xmi:id="_x8G0g2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0hGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3026" name="Action Input Pin" xmi:id="_x8G0jWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0jmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3047" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3047" name="Action Input Pin" xmi:id="_x8G0r2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0sGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3050" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3050" name="Action Input Pin" xmi:id="_x8G0tWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0tmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3053" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3053" name="Action Input Pin" xmi:id="_x8G0u2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0vGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3061" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3061" name="Action Input Pin" xmi:id="_x8G0w2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_x8G0xGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3005" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005" name="Activity Final Node" xmi:id="_x8G0aWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif" xmi:id="_x8G0amaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityFinalNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3059" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059" name="Activity Parameter Node" xmi:id="_x8G0x2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_x8G0yGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityParameterNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067" name="Activity Partition" xmi:id="_x8HbiGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_x8HbiWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActivityPartition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_2001" name="Activity" xmi:id="_x8HbvmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_x8Hbv2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3083" identifier="org.eclipse.papyrus.uml.diagram.activity.Activity_3083" name="Activity" xmi:id="_x8HbkmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_x8Hbk2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3091" identifier="org.eclipse.papyrus.uml.diagram.activity.AddStructuralFeatureValueAction_3091" name="Add Structural Feature Value Action" xmi:id="_x8HboGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" xmi:id="_x8HboWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AddStructuralFeatureValueAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3099" identifier="org.eclipse.papyrus.uml.diagram.activity.AddVariableValueAction_3099" name="Add Variable Value Action" xmi:id="_x8HbsGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddVariableValueAction.gif" xmi:id="_x8HbsWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AddVariableValueAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3102" identifier="org.eclipse.papyrus.uml.diagram.activity.BroadcastSignalAction_3102" name="Broadcast Signal Action" xmi:id="_x8HbtmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" xmi:id="_x8Hbt2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BroadcastSignalAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008" name="Call Behavior Action" xmi:id="_x8G0d2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_x8G0eGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010" name="Call Operation Action" xmi:id="_x8G0gWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_x8G0gmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallOperationAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3104" identifier="org.eclipse.papyrus.uml.diagram.activity.CentralBufferNode_3104" name="Central Buffer Node" xmi:id="_x8HbumaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CentralBufferNode.gif" xmi:id="_x8Hbu2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CentralBufferNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.uml.diagram.activity.Comment_3080" name="Comment" xmi:id="_x8HbjGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_x8HbjWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3069" identifier="org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069" name="Conditional Node" xmi:id="_x8HbcmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif" xmi:id="_x8Hbc2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ConditionalNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3002" name="Constraint" xmi:id="_x8G0Y2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0ZGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3003" name="Constraint" xmi:id="_x8G0ZWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0ZmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3011" name="Constraint" xmi:id="_x8G0nWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0nmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3012" name="Constraint" xmi:id="_x8G0n2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8G0oGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3112" identifier="org.eclipse.papyrus.uml.diagram.activity.Constraint_3112" name="Constraint" xmi:id="_x8HbvGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_x8HbvWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004" name="Control Flow" xmi:id="_x8HbwmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_x8Hbw2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ControlFlow</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3198" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkObjectAction_3198" name="Create Link Object Action" xmi:id="_Wjfh8OGmEeSvI9YIOwR8Lw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" xmi:id="_Wjfh8eGmEeSvI9YIOwR8Lw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CreateLinkObjectAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3086" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateObjectAction_3086" name="Create Object Action" xmi:id="_x8HblGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateObjectAction.gif" xmi:id="_x8HblWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CreateObjectAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078" name="Data Store Node" xmi:id="_x8G0qWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_x8G0qmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataStoreNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038" name="Decision Node" xmi:id="_x8G0oWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_x8G0omaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DecisionNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3095" identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyObjectAction_3095" name="Destroy Object Action" xmi:id="_x8HbqGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyObjectAction.gif" xmi:id="_x8HbqWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DestroyObjectAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3034" identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3034" name="Duration Constraint" xmi:id="_x8G0kWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_x8G0kmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3035" identifier="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3035" name="Duration Constraint" xmi:id="_x8G0k2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_x8G0lGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005" name="Exception Handler" xmi:id="_x8HbxGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExceptionHandler.gif" xmi:id="_x8HbxWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExceptionHandler</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3074" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074" name="Expansion Node" xmi:id="_x8HbdmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_x8Hbd2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3075" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075" name="Expansion Node" xmi:id="_x8HbeGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_x8HbeWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070" name="Expansion Region" xmi:id="_x8HbdGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_x8HbdWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionRegion</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006" name="Flow Final Node" xmi:id="_x8G0a2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_x8G0bGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FlowFinalNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040" name="Fork Node" xmi:id="_x8G0pWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_x8G0pmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ForkNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004" name="Initial Node" xmi:id="_x8G0Z2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_x8G0aGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InitialNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3013" name="Input Pin" xmi:id="_x8G0c2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0dGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3019" name="Input Pin" xmi:id="_x8G0fWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0fmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3023" name="Input Pin" xmi:id="_x8G0h2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0iGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3027" name="Input Pin" xmi:id="_x8G0j2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0kGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3048" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3048" name="Input Pin" xmi:id="_x8G0sWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0smaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3051" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3051" name="Input Pin" xmi:id="_x8G0t2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0uGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3055" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3055" name="Input Pin" xmi:id="_x8G0v2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0wGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3062" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3062" name="Input Pin" xmi:id="_x8G0xWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8G0xmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3089" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3089" name="Input Pin" xmi:id="_x8HbnGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbnWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3092" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3092" name="Input Pin" xmi:id="_x8HbomaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbo2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3093" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3093" name="Input Pin" xmi:id="_x8HbpGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbpWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3096" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3096" name="Input Pin" xmi:id="_x8HbqmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbq2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3100" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3100" name="Input Pin" xmi:id="_x8HbsmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbs2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3101" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3101" name="Input Pin" xmi:id="_x8HbtGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbtWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3103" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3103" name="Input Pin" xmi:id="_x8HbuGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8HbuWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3105" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3105" name="Input Pin" xmi:id="_x8HbhmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_x8Hbh2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3068" identifier="org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068" name="Interruptible Activity Region" xmi:id="_x8HbimaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_x8Hbi2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterruptibleActivityRegion</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3032" identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3032" name="Interval Constraint" xmi:id="_x8G0mWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_x8G0mmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3033" identifier="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3033" name="Interval Constraint" xmi:id="_x8G0m2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_x8G0nGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041" name="Join Node" xmi:id="_x8G0p2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_x8G0qGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.JoinNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071" name="Loop Node" xmi:id="_x8HbemaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_x8Hbe2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LoopNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3039" identifier="org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039" name="Merge Node" xmi:id="_x8G0o2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_x8G0pGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.MergeNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3085" identifier="org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085" name="Shape Named Element" xmi:id="_x8HbmGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_x8HbmWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003" name="Object Flow" xmi:id="_x8HbwGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_x8HbwWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ObjectFlow</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007" name="Opaque Action" xmi:id="_x8G0bWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_x8G0bmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014" name="Output Pin" xmi:id="_x8G0dWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0dmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020" name="Output Pin" xmi:id="_x8G0f2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0gGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3024" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024" name="Output Pin" xmi:id="_x8G0iWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0imaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3064" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064" name="Output Pin" xmi:id="_x8G0y2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8G0zGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077" name="Output Pin" xmi:id="_x8HbcGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbcWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3084" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084" name="Output Pin" xmi:id="_x8HbkGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbkWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3087" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087" name="Output Pin" xmi:id="_x8HblmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbl2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3090" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090" name="Output Pin" xmi:id="_x8HbnmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbn2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3094" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094" name="Output Pin" xmi:id="_x8HbpmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbp2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3098" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098" name="Output Pin" xmi:id="_x8HbrmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbr2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3109" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109" name="Output Pin" xmi:id="_x8HbfGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbfWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3110" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3110" name="Output Pin" xmi:id="_x8HbfmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8Hbf2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3111" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111" name="Output Pin" xmi:id="_x8HbgGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_x8HbgWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3001" identifier="org.eclipse.papyrus.uml.diagram.activity.Parameter_3001" name="Parameter" xmi:id="_x8G0YWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_x8G0YmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3081" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadSelfAction_3081" name="Read Self Action" xmi:id="_x8HbjmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadSelfAction.gif" xmi:id="_x8Hbj2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReadSelfAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3088" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadStructuralFeatureAction_3088" name="Read Structural Feature Action" xmi:id="_x8HbmmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" xmi:id="_x8Hbm2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReadStructuralFeatureAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3097" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadVariableAction_3097" name="Read Variable Action" xmi:id="_x8HbrGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadVariableAction.gif" xmi:id="_x8HbrWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReadVariableAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042" name="Send Object Action" xmi:id="_x8G0q2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_x8G0rGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.SendObjectAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3052" identifier="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052" name="Send Signal Action" xmi:id="_x8G0uWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendSignalAction.gif" xmi:id="_x8G0umaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.SendSignalAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3073" identifier="org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073" name="Sequence Node" xmi:id="_x8HbgmaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif" xmi:id="_x8Hbg2aNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.SequenceNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065" name="Structured Activity Node" xmi:id="_x8HbhGaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_x8HbhWaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StructuredActivityNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3036" identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3036" name="Time Constraint" xmi:id="_x8G0lWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_x8G0lmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3037" identifier="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3037" name="Time Constraint" xmi:id="_x8G0l2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_x8G0mGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3015" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3015" name="Value Pin" xmi:id="_x8G0b2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0cGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3017" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3017" name="Value Pin" xmi:id="_x8G0eWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0emaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3022" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3022" name="Value Pin" xmi:id="_x8G0hWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0hmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3025" name="Value Pin" xmi:id="_x8G0i2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0jGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3046" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3046" name="Value Pin" xmi:id="_x8G0rWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0rmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3049" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3049" name="Value Pin" xmi:id="_x8G0s2aNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0tGaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3054" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3054" name="Value Pin" xmi:id="_x8G0vWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0vmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3060" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3060" name="Value Pin" xmi:id="_x8G0wWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_x8G0wmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3076" identifier="org.eclipse.papyrus.uml.diagram.activity.ValueSpecificationAction_3076" name="Value Specification Action" xmi:id="_x8G0zWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" xmi:id="_x8G0zmaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValueSpecificationAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLActivityDiagram" identifier="org.eclipse.papyrus.uml.diagram.activity.Package_1000" name="Package" xmi:id="_q-4csL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_q-5DwL02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3192" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3192" name="Value Pin" xmi:id="_rAPHkL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAPHkb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3193" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3193" name="Action Input Pin" xmi:id="_rAPuoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAPuob02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3188" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3188" name="Input Pin" xmi:id="_rAVOML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rAVOMb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3189" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3189" name="Value Pin" xmi:id="_rAWcUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAWcUb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3203" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3203" name="Value Pin" xmi:id="_9dDiROsXEeS3WOZTeAfQLw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_9dDiResXEeS3WOZTeAfQLw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3190" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3190" name="Action Input Pin" xmi:id="_rAXqcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAXqcb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3191" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3191" name="Output Pin" xmi:id="_rAYRgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rAYRgb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3181" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3181" name="Input Pin" xmi:id="_rAm7AL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rAm7Ab02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3182" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3182" name="Value Pin" xmi:id="_rAoJIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAoJIb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3183" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3183" name="Value Pin" xmi:id="_rAowML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAowMb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3184" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3184" name="Value Pin" xmi:id="_rAp-UL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAp-Ub02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3185" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3185" name="Action Input Pin" xmi:id="_rArMcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rArMcb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3186" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3186" name="Action Input Pin" xmi:id="_rArzgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rArzgb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3187" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3187" name="Action Input Pin" xmi:id="_rAtBoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAtBob02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3173" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3173" name="Value Pin" xmi:id="_rAwsAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rAwsAb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3174" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3174" name="Action Input Pin" xmi:id="_rAxTEL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rAxTEb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3175" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3175" name="Value Pin" xmi:id="_rA3ZsL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rA3Zsb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3176" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3176" name="Value Pin" xmi:id="_rA4AwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rA4Awb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3177" identifier="org.eclipse.papyrus.uml.diagram.activity.ActoinInputPin_3177" name="Actoin Input Pin" xmi:id="_rA5O4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rA5O4b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3178" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3178" name="Action Input Pin" xmi:id="_rA518L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rA518b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3179" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3179" name="Value Pin" xmi:id="_rA85QL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rA85Qb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3180" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3180" name="Action Input Pin" xmi:id="_rA-HYL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rA-HYb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3113" identifier="org.eclipse.papyrus.uml.diagram.activity.StartObjectBehaviorAction_3113" name="Start Object Behaviour Action" xmi:id="_rBAjoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" xmi:id="_rBAjob02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StartObjectBehaviorAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3125" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3125" name="Output Pin" xmi:id="_rBBxwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBBxwb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3132" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3132" name="Input Pin" xmi:id="_rBC_4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBC_4b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3145" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3145" name="Value Pin" xmi:id="_rBDm8L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBDm8b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3158" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3158" name="Action Input Pin" xmi:id="_rBE1EL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBE1Eb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3133" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3133" name="Input Pin" xmi:id="_rBFcIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBGDML02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3146" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3146" name="Value Pin" xmi:id="_rBGqQL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBGqQb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3159" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3159" name="Action Input Pin" xmi:id="_rBH4YL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBH4Yb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3114" identifier="org.eclipse.papyrus.uml.diagram.activity.TestIdentityAction_3114" name="Test Identity Action" xmi:id="_rBIfcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TestIdentityAction.gif" xmi:id="_rBIfcb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TestIdentityAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3126" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3126" name="Output Pin" xmi:id="_rBJtkL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBJtkb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3134" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3134" name="Input Pin" xmi:id="_rBK7sL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBK7sb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3135" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3135" name="Input Pin" xmi:id="_rBMJ0L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBMJ0b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3147" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3147" name="Value Pin" xmi:id="_rBMw4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBMw4b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3148" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3148" name="Value Pin" xmi:id="_rBN_AL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBN_Ab02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3160" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3160" name="Action Input Pin" xmi:id="_rBPNIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBPNIb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3161" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3161" name="Action Input Pin" xmi:id="_rBQbQL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBQbQb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3115" identifier="org.eclipse.papyrus.uml.diagram.activity.ClearStructuralFeatureAction_3115" name="Clear Structural Feature Action" xmi:id="_rBRCUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" xmi:id="_rBRCUb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ClearStructuralFeatureAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3127" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3127" name="Output Pin" xmi:id="_rBSQcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBSQcb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3136" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3136" name="Input Pin" xmi:id="_rBTekL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBTekb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3149" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3149" name="Value Pin" xmi:id="_rBUssL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBUssb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3162" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3162" name="Action Input Pin" xmi:id="_rBVTwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBVTwb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3117" identifier="org.eclipse.papyrus.uml.diagram.activity.CreateLinkAction_3117" name="Create Link Action" xmi:id="_rBWh4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkAction.gif" xmi:id="_rBWh4b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CreateLinkAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3137" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3137" name="Input Pin" xmi:id="_rBXwAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBXwAb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3151" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3151" name="Value Pin" xmi:id="_rBY-IL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBY-Ib02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3163" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3163" name="Action Input Pin" xmi:id="_rBZlML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBZlMb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3116" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadLinkAction_3116" name="Read Link Action" xmi:id="_rBazUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkAction.gif" xmi:id="_rBazUb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReadLinkAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3128" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3128" name="Output Pin" xmi:id="_rBcBcL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBcBcb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3138" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3138" name="Input Pin" xmi:id="_rBdPkL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBdPkb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3150" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3150" name="Value Pin" xmi:id="_rBedsL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBedsb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3164" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3164" name="Action Input Pin" xmi:id="_rBfEwL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBfEwb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3118" identifier="org.eclipse.papyrus.uml.diagram.activity.DestroyLinkAction_3118" name="Destroy Link Action" xmi:id="_rBgS4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyLinkAction.gif" xmi:id="_rBgS4b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DestroyLinkAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3139" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3139" name="Input Pin" xmi:id="_rBhhAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBhhAb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3152" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3152" name="Value Pin" xmi:id="_rBivIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBivIb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3165" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3165" name="Action Input Pin" xmi:id="_rBjWML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBjWMb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3119" identifier="org.eclipse.papyrus.uml.diagram.activity.ClearAssociationAction_3119" name="Clear Assotiation Action" xmi:id="_rBkkUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearAssociationAction.gif" xmi:id="_rBkkUb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ClearAssociationAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3140" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3140" name="Input Pin" xmi:id="_rBlycL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBlycb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3153" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3153" name="Value Pin" xmi:id="_rBmZgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBmZgb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3166" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3166" name="Action Input Pin" xmi:id="_rBnnoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBnnob02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3120" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadExtentAction_3120" name="Read Extent Action" xmi:id="_rBo1wL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadExtentAction.gif" xmi:id="_rBo1wb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReadExtentAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3129" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3129" name="Output Pin" xmi:id="_rBqD4L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBqD4b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3121" identifier="org.eclipse.papyrus.uml.diagram.activity.ReclassifyObjectAction_3121" name="Reclassify Object Action" xmi:id="_rBqq8L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" xmi:id="_rBqq8b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReclassifyObjectAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3141" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3141" name="Input Pin" xmi:id="_rBr5EL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBr5Eb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3154" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3154" name="Value Pin" xmi:id="_rBtHML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBtHMb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3167" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3167" name="Action Input Pin" xmi:id="_rBtuQL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBuVUL02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3122" identifier="org.eclipse.papyrus.uml.diagram.activity.ReadIsClassifiedObjectAction_3122" name="Read Is Classified Object Action" xmi:id="_rBu8YL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" xmi:id="_rBu8Yb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3130" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3130" name="Output Pin" xmi:id="_rBwKgL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rBwKgb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3142" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3142" name="Input Pin" xmi:id="_rBxYoL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rBxYob02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3155" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3155" name="Value Pin" xmi:id="_rBx_sL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rBx_sb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3168" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3168" name="Action Input Pin" xmi:id="_rBzN0L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rBzN0b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3123" identifier="org.eclipse.papyrus.uml.diagram.activity.ReduceAction_3123" name="Reduce Action" xmi:id="_rBz04L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReduceAction.gif" xmi:id="_rBz04b02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ReduceAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3131" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3131" name="Output Pin" xmi:id="_rB1DAL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_rB1DAb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3202" identifier="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3202" name="Output Pin" xmi:id="_gx2kouGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_gx2ko-GsEeSijulVpZaadA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3143" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3143" name="Input Pin" xmi:id="_rB2RIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rB2RIb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3156" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3156" name="Value Pin" xmi:id="_rB24ML02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rB24Mb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3169" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3169" name="Action Input Pin" xmi:id="_rB4GUL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rB4GUb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3124" identifier="org.eclipse.papyrus.uml.diagram.activity.StartClassifierBehaviorAction_3124" name="Start Classifier Behaviour Action" xmi:id="_rB4tYL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" xmi:id="_rB4tYb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StartClassifierBehaviorAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3144" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3144" name="Input Pin" xmi:id="_rB57gL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_rB57gb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3199" identifier="org.eclipse.papyrus.uml.diagram.activity.InputPin_3199" name="Input Pin" xmi:id="_gx19kOGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_gx19keGsEeSijulVpZaadA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3157" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3157" name="Value Pin" xmi:id="_rB6ikL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_rB6ikb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3200" identifier="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3200" name="Value Pin" xmi:id="_gx19kuGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_gx19k-GsEeSijulVpZaadA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3170" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3170" name="Action Input Pin" xmi:id="_rB7wsL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_rB7wsb02EeSUmeqld4lnBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3201" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3201" name="Action Input Pin" xmi:id="_gx2koOGsEeSijulVpZaadA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_gx2koeGsEeSijulVpZaadA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPrecondition_4001" name="Action Local Precondition" xmi:id="_rB8-0L02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3204" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionPin_3204" name="Action Pin" xmi:id="_9dEJUOsXEeS3WOZTeAfQLw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_9dEJUesXEeS3WOZTeAfQLw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.activity.ActionLocalPostcondition_4002" name="Action Local Postcondition" xmi:id="_rB8-0b02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.activity.CommentAnnotatedElement_4006" name="Comment Annotated Element" xmi:id="_rCACIL02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.activity.ConstraintConstrainedElement_4007" name="Constraint Constrained Element" xmi:id="_rCACIb02EeSUmeqld4lnBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="" identifier="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType" name="Call Behavior Action Base" xmi:id="_N5AjYOnQEeSdwvyVD4uXcQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_N5AjYenQEeSdwvyVD4uXcQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallBehaviorAction</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" target="_x8G0d2aNEeSyJIsxLao1Pw" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" target="_x8G0gWaNEeSyJIsxLao1Pw" xmi:id="_9UmhMGaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" target="_x8G0uWaNEeSyJIsxLao1Pw" xmi:id="_Eu2FMGaPEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index d69cd747257..bf5257bec64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -3318,7 +3318,7 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
    </diagramMappings>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/activityDiagram.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 02d2f85ca72..4fdba116065 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -85,7 +85,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
  org.eclipse.core.databinding.observable,
  org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations
index 5bec9a0610f..c6ae7a3a088 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram-notation.elementtypesconfigurations
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="PapyrusUMLClassDiagramNotation" xmi:id="_rWOX8XPzEeSnGJwaJWHCSg" xmi:version="2.0">
-  <elementTypeConfigurations hint="4016" identifier="org.eclipse.papyrus.uml.diagram.clazz.Link_4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="AssociationClassDashedLink" xmi:id="_rWOX8nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="PapyrusUMLClassDiagramNotation" xmi:id="_rWOX8XPzEeSnGJwaJWHCSg" xmi:version="2.0">

+  <elementTypeConfigurations hint="4016" identifier="org.eclipse.papyrus.uml.diagram.clazz.Link_4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="AssociationClassDashedLink" xmi:id="_rWOX8nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
index a7fbc7ad339..ad715b79ff4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
@@ -1,406 +1,406 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLClassDiagram" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
-  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006" name="Abstraction" xmi:id="_rWNxfnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_rWNxf3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013" name="Association Class" xmi:id="_rWNxSnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_rWNxS3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AssociationClass</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017" name="Association Class Link" xmi:id="_rWNxcHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_rWNxcXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AssociationClass</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_2015" name="Association Node" xmi:id="_rWNxTHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_rWNxTXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4001" name="Association Link" xmi:id="_rWNxcnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_rWNxc3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4019" name="Association Branch Link" xmi:id="_rWNxdHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_rWNxdXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_2008" name="Class" xmi:id="_rWNxXnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNxX3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3004" name="Class" xmi:id="_rWNw7nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNw73PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3008" name="Class" xmi:id="_rWNw8HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNw8XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3010" name="Class" xmi:id="_rWNxIHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNxIXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3014" name="Class" xmi:id="_rWNw7HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNw7XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3031" identifier="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031" name="Classifier Template Parameter" xmi:id="_rWNxAHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" xmi:id="_rWNxAXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ClassifierTemplateParameter</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013" name="Comment Annotated Element" xmi:id="_rWNxjnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012" name="Comment" xmi:id="_rWNxZnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_rWNxZ3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3028" identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028" name="Comment" xmi:id="_rWNxJnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_rWNxJ3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2002" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_2002" name="Component" xmi:id="_rWNxUHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_rWNxUXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3021" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3021" name="Component" xmi:id="_rWNxEnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_rWNxE3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3055" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3055" name="Component" xmi:id="_YG8VoDBeEeWaIJ-gnmghAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_5idDIDBeEeWaIJ-gnmghAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3056" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3056" name="Component" xmi:id="_Gn9g0DBfEeWaIJ-gnmghAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_KWqKsDBgEeWaIJ-gnmghAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3057" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3057" name="Component" xmi:id="_H4IIMDBfEeWaIJ-gnmghAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_LKmJEDBgEeWaIJ-gnmghAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3034" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034" name="Connectable Element Template Parameter" xmi:id="_rWNw_HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" xmi:id="_rWNw_XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ConnectableElementTemplateParameter</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014" name="Constraint Constrained Element" xmi:id="_rWNxj3PzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500" name="Constraint Context" xmi:id="_rWOX8HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011" name="Constraint" xmi:id="_rWNxZHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_rWNxZXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3029" identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029" name="Constraint" xmi:id="_rWNxKHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_rWNxKXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4023" identifier="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023" name="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023" xmi:id="_rWNxlnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Element.OwnedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010" name="Data Type" xmi:id="_rWNxYnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxY3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027" name="Data Type" xmi:id="_rWNxJHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxJXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3043" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043" name="Data Type" xmi:id="_rWNxQHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxQXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3044" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044" name="Data Type" xmi:id="_rWNxPHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxPXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3045" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045" name="Data Type" xmi:id="_rWNxPnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxP3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014" name="Dependency Node" xmi:id="_rWNxSHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_rWNxSXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008" name="Dependency Link" xmi:id="_rWNxgnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_rWNxg3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018" name="Dependency Branch Link" xmi:id="_rWNxhHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_rWNxhXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016" name="Short Cut Diagram" xmi:id="_rWNxaHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Diagram.gif" xmi:id="_rWNxaXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4025" identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025" name="Duration Observation Event" xmi:id="_rWNxmHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2095" identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095" name="Duration Observation" xmi:id="_rWNxanPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif" xmi:id="_rWNxa3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009" name="Element Import" xmi:id="_rWNxhnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_rWNxh3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ElementImport</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3017" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017" name="Enumeration Literal" xmi:id="_rWNxBHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_rWNxBXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006" name="Enumeration" xmi:id="_rWNxWHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxWXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025" name="Enumeration" xmi:id="_rWNxGnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxG3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3052" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052" name="Enumeration" xmi:id="_rWNxMHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxMXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3053" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053" name="Enumeration" xmi:id="_rWNxMnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxM3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3054" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054" name="Enumeration" xmi:id="_rWNxNHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxNXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4020" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020" name="Generalization Set" xmi:id="_rWNxknPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralizationSet.gif" xmi:id="_rWNxk3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.GeneralizationSet</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002" name="Generalization" xmi:id="_rWNxdnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_rWNxd3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4026" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026" name="Information Flow" xmi:id="_rWNxmXPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_rWNxmnPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2099" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099" name="Information Item" xmi:id="_rWNxXHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_rWNxXXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040" name="Information Item" xmi:id="_rWNxHnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_rWNxH3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4021" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021" name="Instance Specification Link" xmi:id="_rWNxlHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_rWNxlXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification.Link</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001" name="Instance Specification" xmi:id="_rWNxTnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_rWNxT3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020" name="Instance Specification" xmi:id="_rWNxEHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_rWNxEXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003" name="Interface Realization" xmi:id="_rWNxeHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_rWNxeXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2004" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004" name="Interface" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023" name="Interface" xmi:id="_rWNxFnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxF3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3036" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036" name="Interface" xmi:id="_rWNxKnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxK3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3037" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037" name="Interface" xmi:id="_rWNxLHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxLXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038" name="Interface" xmi:id="_rWNxLnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxL3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_2005" name="Model" xmi:id="_rWNxVnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_rWNxV3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3024" identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_3024" name="Model" xmi:id="_rWNxGHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_rWNxGXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2097" identifier="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097" name="Default Named Element" xmi:id="_rWNxbnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_rWNxb3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3035" identifier="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035" name="Operation Template Parameter" xmi:id="_rWNw_nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" xmi:id="_rWNw_3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OperationTemplateParameter</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003" name="Operation" xmi:id="_rWNw9HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw9XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007" name="Operation" xmi:id="_rWNw9nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw93PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013" name="Operation" xmi:id="_rWNw8nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw83PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019" name="Operation" xmi:id="_rWNw-nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw-3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042" name="Operation" xmi:id="_rWNw-HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw-XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010" name="Package Import" xmi:id="_rWNxiHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_rWNxiXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011" name="Package Merge" xmi:id="_rWNxinPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_rWNxi3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageMerge</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2007" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_2007" name="Package" xmi:id="_rWNxWnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_rWNxW3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3009" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_3009" name="Package" xmi:id="_rWNxHHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_rWNxHXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009" name="Primitive Type" xmi:id="_rWNxYHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxYXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026" name="Primitive Type" xmi:id="_rWNxInPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxI3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3046" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046" name="Primitive Type" xmi:id="_rWNxOHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxOXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3047" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047" name="Primitive Type" xmi:id="_rWNxNnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxN3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3048" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048" name="Primitive Type" xmi:id="_rWNxOnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxO3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012" name="Profile Application" xmi:id="_rWNxjHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_rWNxjXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ProfileApplication</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3002" name="Property" xmi:id="_rWNw4nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw43PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3005" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3005" name="Property" xmi:id="_rWNw5HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw5XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3006" name="Property" xmi:id="_rWNw5nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw53PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3012" name="Property" xmi:id="_rWNw4HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw4XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3018" name="Property" xmi:id="_rWNw6nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw63PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3041" name="Property" xmi:id="_rWNw6HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw6XPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005" name="Realization" xmi:id="_rWNxfHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_rWNxfXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011" name="Reception" xmi:id="_rWNxBnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_rWNxB3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3039" identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039" name="Reception" xmi:id="_rWNxCHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_rWNxCXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3015" identifier="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015" name="Redefinable Template Signature" xmi:id="_rWNxDHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" xmi:id="_rWNxDXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableTemplateSignature</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2003" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003" name="Signal" xmi:id="_rWNxUnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxU3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3022" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022" name="Signal" xmi:id="_rWNxFHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxFXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3049" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049" name="Signal" xmi:id="_rWNxRnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxR3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3050" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050" name="Signal" xmi:id="_rWNxQnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxQ3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3051" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051" name="Signal" xmi:id="_rWNxRHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxRXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3030" identifier="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030" name="Slot" xmi:id="_rWNxCnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_rWNxC3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004" name="Substitution" xmi:id="_rWNxenPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_rWNxe3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015" name="Template Binding" xmi:id="_rWNxkHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateBinding.gif" xmi:id="_rWNxkXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TemplateBinding</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3016" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016" name="Template Parameter" xmi:id="_rWNxAnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameter.gif" xmi:id="_rWNxA3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TemplateParameter</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3033" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033" name="Template Signature" xmi:id="_rWNxDnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateSignature.gif" xmi:id="_rWNxD3PzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TemplateSignature</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4024" identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024" name="Time Observation Event" xmi:id="_rWNxl3PzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2096" identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096" name="Time Observation" xmi:id="_rWNxbHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif" xmi:id="_rWNxbXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007" name="Usage" xmi:id="_rWNxgHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_rWNxgXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLClassDiagram" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_1000" name="Package" xmi:id="_Blq1UK_vEeSWIf43-VACFg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_Blq1Ua_vEeSWIf43-VACFg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations description="Enumeration specific advices (remove inconsistent views when an Enumeration or a child is moved)" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.EnumerationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationHelperAdvice" inheritance="all" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted)" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.GeneralizationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationHelperAdvice" inheritance="all" xmi:id="_VPE3UJpvEeWZOI1l_xp4vg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLClassDiagram" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">

+  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006" name="Abstraction" xmi:id="_rWNxfnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_rWNxf3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_2013" name="Association Class" xmi:id="_rWNxSnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_rWNxS3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AssociationClass</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.clazz.AssociationClass_4017" name="Association Class Link" xmi:id="_rWNxcHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_rWNxcXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AssociationClass</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_2015" name="Association Node" xmi:id="_rWNxTHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_rWNxTXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4001" name="Association Link" xmi:id="_rWNxcnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_rWNxc3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.clazz.Association_4019" name="Association Branch Link" xmi:id="_rWNxdHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_rWNxdXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_2008" name="Class" xmi:id="_rWNxXnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNxX3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3004" name="Class" xmi:id="_rWNw7nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNw73PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3008" name="Class" xmi:id="_rWNw8HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNw8XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3010" name="Class" xmi:id="_rWNxIHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNxIXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.uml.diagram.clazz.Class_3014" name="Class" xmi:id="_rWNw7HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_rWNw7XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3031" identifier="org.eclipse.papyrus.uml.diagram.clazz.ClassifierTemplateParameter_3031" name="Classifier Template Parameter" xmi:id="_rWNxAHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" xmi:id="_rWNxAXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ClassifierTemplateParameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013" name="Comment Annotated Element" xmi:id="_rWNxjnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_2012" name="Comment" xmi:id="_rWNxZnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_rWNxZ3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3028" identifier="org.eclipse.papyrus.uml.diagram.clazz.Comment_3028" name="Comment" xmi:id="_rWNxJnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_rWNxJ3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2002" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_2002" name="Component" xmi:id="_rWNxUHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_rWNxUXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3021" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3021" name="Component" xmi:id="_rWNxEnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_rWNxE3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3055" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3055" name="Component" xmi:id="_YG8VoDBeEeWaIJ-gnmghAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_5idDIDBeEeWaIJ-gnmghAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3056" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3056" name="Component" xmi:id="_Gn9g0DBfEeWaIJ-gnmghAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_KWqKsDBgEeWaIJ-gnmghAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3057" identifier="org.eclipse.papyrus.uml.diagram.clazz.Component_3057" name="Component" xmi:id="_H4IIMDBfEeWaIJ-gnmghAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_LKmJEDBgEeWaIJ-gnmghAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3034" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConnectableElementTemplateParameter_3034" name="Connectable Element Template Parameter" xmi:id="_rWNw_HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" xmi:id="_rWNw_XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ConnectableElementTemplateParameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintConstrainedElement_4014" name="Constraint Constrained Element" xmi:id="_rWNxj3PzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.clazz.ConstraintContext_8500" name="Constraint Context" xmi:id="_rWOX8HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011" name="Constraint" xmi:id="_rWNxZHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_rWNxZXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3029" identifier="org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029" name="Constraint" xmi:id="_rWNxKHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_rWNxKXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4023" identifier="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023" name="org.eclipse.papyrus.uml.diagram.clazz.ContainmentLink_4023" xmi:id="_rWNxlnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Element.OwnedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_2010" name="Data Type" xmi:id="_rWNxYnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxY3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3027" name="Data Type" xmi:id="_rWNxJHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxJXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3043" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3043" name="Data Type" xmi:id="_rWNxQHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxQXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3044" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3044" name="Data Type" xmi:id="_rWNxPHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxPXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3045" identifier="org.eclipse.papyrus.uml.diagram.clazz.DataType_3045" name="Data Type" xmi:id="_rWNxPnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_rWNxP3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014" name="Dependency Node" xmi:id="_rWNxSHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_rWNxSXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008" name="Dependency Link" xmi:id="_rWNxgnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_rWNxg3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018" name="Dependency Branch Link" xmi:id="_rWNxhHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_rWNxhXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.clazz.Diagram_2016" name="Short Cut Diagram" xmi:id="_rWNxaHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Diagram.gif" xmi:id="_rWNxaXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4025" identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservationEvent_4025" name="Duration Observation Event" xmi:id="_rWNxmHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2095" identifier="org.eclipse.papyrus.uml.diagram.clazz.DurationObservation_2095" name="Duration Observation" xmi:id="_rWNxanPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif" xmi:id="_rWNxa3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.clazz.ElementImport_4009" name="Element Import" xmi:id="_rWNxhnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_rWNxh3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ElementImport</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3017" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationLiteral_3017" name="Enumeration Literal" xmi:id="_rWNxBHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_rWNxBXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_2006" name="Enumeration" xmi:id="_rWNxWHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxWXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3025" name="Enumeration" xmi:id="_rWNxGnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxG3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3052" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3052" name="Enumeration" xmi:id="_rWNxMHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxMXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3053" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3053" name="Enumeration" xmi:id="_rWNxMnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxM3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3054" identifier="org.eclipse.papyrus.uml.diagram.clazz.Enumeration_3054" name="Enumeration" xmi:id="_rWNxNHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_rWNxNXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4020" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationSet_4020" name="Generalization Set" xmi:id="_rWNxknPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralizationSet.gif" xmi:id="_rWNxk3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.GeneralizationSet</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002" name="Generalization" xmi:id="_rWNxdnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_rWNxd3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4026" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationFlow_4026" name="Information Flow" xmi:id="_rWNxmXPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_rWNxmnPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2099" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_2099" name="Information Item" xmi:id="_rWNxXHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_rWNxXXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.uml.diagram.clazz.InformationItem_3040" name="Information Item" xmi:id="_rWNxHnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_rWNxH3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4021" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021" name="Instance Specification Link" xmi:id="_rWNxlHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_rWNxlXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification.Link</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001" name="Instance Specification" xmi:id="_rWNxTnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_rWNxT3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020" name="Instance Specification" xmi:id="_rWNxEHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_rWNxEXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.clazz.InterfaceRealization_4003" name="Interface Realization" xmi:id="_rWNxeHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_rWNxeXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2004" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_2004" name="Interface" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3023" name="Interface" xmi:id="_rWNxFnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxF3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3036" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3036" name="Interface" xmi:id="_rWNxKnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxK3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3037" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3037" name="Interface" xmi:id="_rWNxLHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxLXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.uml.diagram.clazz.Interface_3038" name="Interface" xmi:id="_rWNxLnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxL3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_2005" name="Model" xmi:id="_rWNxVnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_rWNxV3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3024" identifier="org.eclipse.papyrus.uml.diagram.clazz.Model_3024" name="Model" xmi:id="_rWNxGHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_rWNxGXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2097" identifier="org.eclipse.papyrus.uml.diagram.clazz.NamedElement_2097" name="Default Named Element" xmi:id="_rWNxbnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_rWNxb3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3035" identifier="org.eclipse.papyrus.uml.diagram.clazz.OperationTemplateParameter_3035" name="Operation Template Parameter" xmi:id="_rWNw_nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" xmi:id="_rWNw_3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OperationTemplateParameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3003" name="Operation" xmi:id="_rWNw9HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw9XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3007" name="Operation" xmi:id="_rWNw9nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw93PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3013" name="Operation" xmi:id="_rWNw8nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw83PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3019" name="Operation" xmi:id="_rWNw-nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw-3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.uml.diagram.clazz.Operation_3042" name="Operation" xmi:id="_rWNw-HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_rWNw-XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageImport_4010" name="Package Import" xmi:id="_rWNxiHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_rWNxiXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.clazz.PackageMerge_4011" name="Package Merge" xmi:id="_rWNxinPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_rWNxi3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageMerge</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2007" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_2007" name="Package" xmi:id="_rWNxWnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_rWNxW3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3009" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_3009" name="Package" xmi:id="_rWNxHHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_rWNxHXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_2009" name="Primitive Type" xmi:id="_rWNxYHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxYXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3026" name="Primitive Type" xmi:id="_rWNxInPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxI3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3046" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3046" name="Primitive Type" xmi:id="_rWNxOHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxOXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3047" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3047" name="Primitive Type" xmi:id="_rWNxNnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxN3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3048" identifier="org.eclipse.papyrus.uml.diagram.clazz.PrimitiveType_3048" name="Primitive Type" xmi:id="_rWNxOnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_rWNxO3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.clazz.ProfileApplication_4012" name="Profile Application" xmi:id="_rWNxjHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_rWNxjXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ProfileApplication</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3002" name="Property" xmi:id="_rWNw4nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw43PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3005" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3005" name="Property" xmi:id="_rWNw5HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw5XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3006" name="Property" xmi:id="_rWNw5nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw53PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3012" name="Property" xmi:id="_rWNw4HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw4XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3018" name="Property" xmi:id="_rWNw6nPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw63PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.uml.diagram.clazz.Property_3041" name="Property" xmi:id="_rWNw6HPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_rWNw6XPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.clazz.Realization_4005" name="Realization" xmi:id="_rWNxfHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_rWNxfXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3011" name="Reception" xmi:id="_rWNxBnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_rWNxB3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3039" identifier="org.eclipse.papyrus.uml.diagram.clazz.Reception_3039" name="Reception" xmi:id="_rWNxCHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_rWNxCXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3015" identifier="org.eclipse.papyrus.uml.diagram.clazz.RedefinableTemplateSignature_3015" name="Redefinable Template Signature" xmi:id="_rWNxDHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" xmi:id="_rWNxDXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.RedefinableTemplateSignature</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2003" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_2003" name="Signal" xmi:id="_rWNxUnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxU3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3022" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3022" name="Signal" xmi:id="_rWNxFHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxFXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3049" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3049" name="Signal" xmi:id="_rWNxRnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxR3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3050" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3050" name="Signal" xmi:id="_rWNxQnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxQ3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3051" identifier="org.eclipse.papyrus.uml.diagram.clazz.Signal_3051" name="Signal" xmi:id="_rWNxRHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_rWNxRXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3030" identifier="org.eclipse.papyrus.uml.diagram.clazz.Slot_3030" name="Slot" xmi:id="_rWNxCnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_rWNxC3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Slot</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.clazz.Substitution_4004" name="Substitution" xmi:id="_rWNxenPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_rWNxe3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateBinding_4015" name="Template Binding" xmi:id="_rWNxkHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateBinding.gif" xmi:id="_rWNxkXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TemplateBinding</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3016" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateParameter_3016" name="Template Parameter" xmi:id="_rWNxAnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameter.gif" xmi:id="_rWNxA3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TemplateParameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3033" identifier="org.eclipse.papyrus.uml.diagram.clazz.TemplateSignature_3033" name="Template Signature" xmi:id="_rWNxDnPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateSignature.gif" xmi:id="_rWNxD3PzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TemplateSignature</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4024" identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservationEvent_4024" name="Time Observation Event" xmi:id="_rWNxl3PzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2096" identifier="org.eclipse.papyrus.uml.diagram.clazz.TimeObservation_2096" name="Time Observation" xmi:id="_rWNxbHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif" xmi:id="_rWNxbXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.clazz.Usage_4007" name="Usage" xmi:id="_rWNxgHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_rWNxgXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLClassDiagram" identifier="org.eclipse.papyrus.uml.diagram.clazz.Package_1000" name="Package" xmi:id="_Blq1UK_vEeSWIf43-VACFg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_Blq1Ua_vEeSWIf43-VACFg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations description="Enumeration specific advices (remove inconsistent views when an Enumeration or a child is moved)" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.EnumerationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationHelperAdvice" inheritance="all" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted)" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.GeneralizationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationHelperAdvice" inheritance="all" xmi:id="_VPE3UJpvEeWZOI1l_xp4vg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
index 12a90d38268..caa5e7271be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.xml
@@ -1713,14 +1713,14 @@
       <?gmfgen generated="true"?>
    </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
          clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/classdiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/classdiagram-notation.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
index 9054f582cbd..5ac71abc29e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram-notation.elementtypesconfigurations
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.uml.diagram.component.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_XB3QgM2QEeSF96aioTD1kQ" xmi:version="2.0">
-  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4018" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="InterfacePortLink" xmi:id="_XB33kc2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4016" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Undefined" xmi:id="_XB33kM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.uml.diagram.component.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_XB3QgM2QEeSF96aioTD1kQ" xmi:version="2.0">

+  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4018" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="InterfacePortLink" xmi:id="_XB33kc2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4016" identifier="org.eclipse.papyrus.uml.diagram.component.Link_4016" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Undefined" xmi:id="_XB33kM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
index c39755ecc80..d5f77057699 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.elementtypesconfigurations
@@ -1,140 +1,140 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.component.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLComponentDiagram" xmi:id="_WyQuQM2QEeSF96aioTD1kQ" xmi:version="2.0">
-  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013" name="Abstraction" xmi:id="_XBmx0M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_XBmx0c2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3074" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074" name="Comment" xmi:id="_W_wXsM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_W_w-wM2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3201" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201" name="Comment" xmi:id="_XAwdQM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_XAxEUM2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008" name="Comment Annotated Element" xmi:id="_XBnY4M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3070" name="Component" xmi:id="_W_qREM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_W_q4IM2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3071" name="Component" xmi:id="_W_t7cM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_W_t7cc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2002" identifier="org.eclipse.papyrus.uml.diagram.component.Component_2002" name="Component" xmi:id="_XAafAM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_XAafAc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007" name="Component Realization" xmi:id="_XBhSQM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif" xmi:id="_XBhSQc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.component.Connector_4019" name="Connector" xmi:id="_XB2pcM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_XB2pcc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3075" identifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075" name="Constraint" xmi:id="_W_0CEM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_W_0CEc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3199" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199" name="Constraint" xmi:id="_XA180M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_XA180c2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009" name="Constraint Constrained Element" xmi:id="_XBnY4c2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3204" identifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204" name="Default Named Element" xmi:id="_XA61UM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_XA61Uc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017" name="Dependency" xmi:id="_XBxw8M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_XBxw8c2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4010" name="Dependency Link" xmi:id="_XBsRYM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_XBsRYc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3203" identifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203" name="Dependency Node" xmi:id="_XATxUM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_XATxUc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003" name="Generalization" xmi:id="_XBQzkM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_XBQzkc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3078" name="Interface" xmi:id="_W_i8UM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_W_i8Uc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3072" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072" name="Interface" xmi:id="_XAHkEM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_XAHkEc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3205" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3205" name="Interface" xmi:id="_XAq9sM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_XAq9sc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2003" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003" name="Interface" xmi:id="_XBAU4M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_XBAU4c2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006" name="Interface Realization" xmi:id="_XBLUAM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_XBLUAc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014" name="Manifestation" xmi:id="_XBbysM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_XBbysc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3077" name="Model" xmi:id="_W_bnkM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_W_bnkc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3202" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3202" name="Model" xmi:id="_XAfXgM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_XAfXgc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="5" identifier="org.eclipse.papyrus.uml.diagram.component.Operation_5" name="Operation" xmi:id="_W_8k8M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_W_8k8c2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLComponentDiagram" identifier="org.eclipse.papyrus.uml.diagram.component.Model_1000" name="Package" xmi:id="_W-nvQM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_W-nvQc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3076" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3076" name="Package" xmi:id="_W_eq4M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_W_eq4c2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3200" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3200" name="Package" xmi:id="_XAmFMM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_XAmFMc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3069" identifier="org.eclipse.papyrus.uml.diagram.component.Port_3069" name="Port" xmi:id="_W_X9MM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_W_X9Mc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1" identifier="org.eclipse.papyrus.uml.diagram.component.Property_1" name="Property" xmi:id="_W_3FYM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_W_3FYc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3079" identifier="org.eclipse.papyrus.uml.diagram.component.Property_3079" name="Property" xmi:id="_XAORwM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_XAORwc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="6" identifier="org.eclipse.papyrus.uml.diagram.component.Reception_6" name="Reception" xmi:id="_XACrkM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_XACrkc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012" name="Substitution" xmi:id="_XBWTIM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_XBWTIc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001" name="Usage" xmi:id="_XBF0cM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_XBF0cc2QEeSF96aioTD1kQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.component.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLComponentDiagram" xmi:id="_WyQuQM2QEeSF96aioTD1kQ" xmi:version="2.0">

+  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.component.Abstraction_4013" name="Abstraction" xmi:id="_XBmx0M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_XBmx0c2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3074" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3074" name="Comment" xmi:id="_W_wXsM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_W_w-wM2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3201" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3201" name="Comment" xmi:id="_XAwdQM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_XAxEUM2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.component.CommentAnnotatedElement_4008" name="Comment Annotated Element" xmi:id="_XBnY4M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3070" name="Component" xmi:id="_W_qREM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_W_q4IM2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.uml.diagram.component.Component_3071" name="Component" xmi:id="_W_t7cM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_W_t7cc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2002" identifier="org.eclipse.papyrus.uml.diagram.component.Component_2002" name="Component" xmi:id="_XAafAM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_XAafAc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.component.ComponentRealization_4007" name="Component Realization" xmi:id="_XBhSQM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif" xmi:id="_XBhSQc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.component.Connector_4019" name="Connector" xmi:id="_XB2pcM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_XB2pcc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3075" identifier="org.eclipse.papyrus.uml.diagram.component.Constraint_3075" name="Constraint" xmi:id="_W_0CEM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_W_0CEc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3199" identifier="org.eclipse.papyrus.uml.diagram.component.Comment_3199" name="Constraint" xmi:id="_XA180M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_XA180c2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.component.ConstraintConstrainedElement_4009" name="Constraint Constrained Element" xmi:id="_XBnY4c2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3204" identifier="org.eclipse.papyrus.uml.diagram.component.DefaultNamedElement_3204" name="Default Named Element" xmi:id="_XA61UM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_XA61Uc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4017" name="Dependency" xmi:id="_XBxw8M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_XBxw8c2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.component.Dependency_4010" name="Dependency Link" xmi:id="_XBsRYM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_XBsRYc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3203" identifier="org.eclipse.papyrus.uml.diagram.component.DependencyNode_3203" name="Dependency Node" xmi:id="_XATxUM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_XATxUc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.component.Generalization_4003" name="Generalization" xmi:id="_XBQzkM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_XBQzkc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3078" name="Interface" xmi:id="_W_i8UM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_W_i8Uc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3072" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3072" name="Interface" xmi:id="_XAHkEM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_XAHkEc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3205" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_3205" name="Interface" xmi:id="_XAq9sM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_XAq9sc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2003" identifier="org.eclipse.papyrus.uml.diagram.component.Interface_2003" name="Interface" xmi:id="_XBAU4M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_XBAU4c2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006" name="Interface Realization" xmi:id="_XBLUAM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_XBLUAc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.component.Manifestation_4014" name="Manifestation" xmi:id="_XBbysM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_XBbysc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3077" name="Model" xmi:id="_W_bnkM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_W_bnkc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3202" identifier="org.eclipse.papyrus.uml.diagram.component.Model_3202" name="Model" xmi:id="_XAfXgM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_XAfXgc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="5" identifier="org.eclipse.papyrus.uml.diagram.component.Operation_5" name="Operation" xmi:id="_W_8k8M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_W_8k8c2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLComponentDiagram" identifier="org.eclipse.papyrus.uml.diagram.component.Model_1000" name="Package" xmi:id="_W-nvQM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_W-nvQc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3076" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3076" name="Package" xmi:id="_W_eq4M2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_W_eq4c2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3200" identifier="org.eclipse.papyrus.uml.diagram.component.Package_3200" name="Package" xmi:id="_XAmFMM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_XAmFMc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3069" identifier="org.eclipse.papyrus.uml.diagram.component.Port_3069" name="Port" xmi:id="_W_X9MM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_W_X9Mc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1" identifier="org.eclipse.papyrus.uml.diagram.component.Property_1" name="Property" xmi:id="_W_3FYM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_W_3FYc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3079" identifier="org.eclipse.papyrus.uml.diagram.component.Property_3079" name="Property" xmi:id="_XAORwM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_XAORwc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="6" identifier="org.eclipse.papyrus.uml.diagram.component.Reception_6" name="Reception" xmi:id="_XACrkM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_XACrkc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Reception</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.component.Substitution_4012" name="Substitution" xmi:id="_XBWTIM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_XBWTIc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.component.Usage_4001" name="Usage" xmi:id="_XBF0cM2QEeSF96aioTD1kQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_XBF0cc2QEeSF96aioTD1kQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 595c46e3611..7459fc7184c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -1013,14 +1013,14 @@
 </extension>
 
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/ComponentDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    		 clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/ComponentDiagram-notation.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index a3c3e2e6f9f..01c7d4c597b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -83,7 +83,7 @@ Require-Bundle: org.eclipse.emf.ecore,
  org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
  org.eclipse.core.databinding.observable,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.hyperlink;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
index a064979c28e..ec5e082f9c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram-notation.elementtypesconfigurations
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_tT4HoLazEeSbnofizoRSMQ" xmi:version="2.0">
-  <elementTypeConfigurations hint="3121" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3121" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Node_3121" xmi:id="_tT4HobazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4022" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4022" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Link_4022" xmi:id="_tT5VwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4001" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Link_4001" xmi:id="_tT5VwbazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_tT4HoLazEeSbnofizoRSMQ" xmi:version="2.0">

+  <elementTypeConfigurations hint="3121" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3121" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Node_3121" xmi:id="_tT4HobazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4022" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4022" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Link_4022" xmi:id="_tT5VwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.composite.Link_4001" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Link_4001" xmi:id="_tT5VwbazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
index ad7757addd8..68d65010033 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
@@ -1,422 +1,422 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="CompositeStructure" xmi:id="_tL86sLazEeSbnofizoRSMQ" xmi:version="2.0">
-  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007" name="Abstraction" xmi:id="_tTshcLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_tTshcbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3072" identifier="org.eclipse.papyrus.uml.diagram.composite.Activity_3072" name="Activity" xmi:id="_tSdyYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_tSdyYbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2060" identifier="org.eclipse.papyrus.uml.diagram.composite.Activity_2060" name="Activity" xmi:id="_tTAk8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_tTAk8bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3091" identifier="org.eclipse.papyrus.uml.diagram.composite.Actor_3091" name="Actor" xmi:id="_tSzwoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_tSzwobazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2077" identifier="org.eclipse.papyrus.uml.diagram.composite.Actor_2077" name="Actor" xmi:id="_tTMyMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_tTMyMbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2085" identifier="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085" name="Any Receive Event" xmi:id="_tTSRwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" xmi:id="_tTSRwbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AnyReceiveEvent</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3093" identifier="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093" name="Artifact" xmi:id="_tS0-wLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_tS0-wbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2079" identifier="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079" name="Artifact" xmi:id="_tTOAULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_tTOAUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2084" identifier="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084" name="Call Event" xmi:id="_tTRqsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_tTRqsbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2088" identifier="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088" name="Change Event" xmi:id="_tTS40LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_tTS40bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3085" identifier="org.eclipse.papyrus.uml.diagram.composite.Class_3085" name="Class" xmi:id="_tStqALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_tStqAbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2073" identifier="org.eclipse.papyrus.uml.diagram.composite.Class_2073" name="Class" xmi:id="_tTH5sLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_tTH5sbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3086" identifier="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086" name="Collaboration" xmi:id="_tSu4ILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_tSu4IbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2075" identifier="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075" name="Collaboration" xmi:id="_tTJH0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_tTJH0bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3115" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationRole_3115" name="Collaboration Role" xmi:id="_tSZg8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElement.gif" xmi:id="_tSZg8bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration.CollaborationRole</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071" name="Collaboration Use" xmi:id="_tSb9MLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CollaborationUse.gif" xmi:id="_tSb9MbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CollaborationUse</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3097" identifier="org.eclipse.papyrus.uml.diagram.composite.Comment_3097" name="Comment" xmi:id="_tS4pILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_tS4pIbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2109" identifier="org.eclipse.papyrus.uml.diagram.composite.Comment_2109" name="Comment" xmi:id="_tTj-kLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_tTj-kbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002" name="Comment Annotated Element" xmi:id="_tToQALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3081" identifier="org.eclipse.papyrus.uml.diagram.composite.Component_3081" name="Component" xmi:id="_tSmVQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_tSmVQbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2069" identifier="org.eclipse.papyrus.uml.diagram.composite.Component_2069" name="Component" xmi:id="_tTE2YLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_tTE2YbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004" name="Component Realization" xmi:id="_tTo3ELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif" xmi:id="_tTo3EbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.composite.Connector_4013" name="Connector" xmi:id="_tTwL0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_tTwL0bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3120" identifier="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120" name="Constraint" xmi:id="_tS9hoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_tS9hobazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2114" identifier="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114" name="Constraint" xmi:id="_tTnB4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_tTnB4bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003" name="Constraint Constrained Element" xmi:id="_tToQAbazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.uml.diagram.composite.DataType_3080" name="Data Type" xmi:id="_tSzJkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_tSzJkbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2068" identifier="org.eclipse.papyrus.uml.diagram.composite.DataType_2068" name="Data Type" xmi:id="_tTMLILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_tTMLIbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010" name="Dependency" xmi:id="_tTvkwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_tTvkwbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009" name="Deployment" xmi:id="_tTtvkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif" xmi:id="_tTtvkbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Deployment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3092" identifier="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092" name="Deployment Specification" xmi:id="_tS0XsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_tS0XsbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2078" identifier="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078" name="Deployment Specification" xmi:id="_tTNZQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_tTNZQbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3082" identifier="org.eclipse.papyrus.uml.diagram.composite.Device_3082" name="Device" xmi:id="_tSnjYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_tSnjYbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2070" identifier="org.eclipse.papyrus.uml.diagram.composite.Device_2070" name="Device" xmi:id="_tTGEgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_tTGEgbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2104" identifier="org.eclipse.papyrus.uml.diagram.composite.Duration_2104" name="Duration" xmi:id="_tTftILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Duration.gif" xmi:id="_tTftIbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Duration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3116" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116" name="Duration Constraint" xmi:id="_tS5QMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_tS5QMbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2110" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110" name="Duration Constraint" xmi:id="_tTkloLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_tTklobazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2106" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106" name="Duration Interval" xmi:id="_tThiULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationInterval.gif" xmi:id="_tThiUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationInterval</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2093" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093" name="Duration Observation" xmi:id="_tTVVELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif" xmi:id="_tTVVEbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019" name="Duration Observation Event" xmi:id="_tT2ScLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3079" identifier="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079" name="Enumeration" xmi:id="_tSyigLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_tSyigbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2067" identifier="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067" name="Enumeration" xmi:id="_tTK9ALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_tTK9AbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3066" identifier="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066" name="Enumeration Literal" xmi:id="_tS_94LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_tS_94bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3083" identifier="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083" name="Execution Environment" xmi:id="_tSoxgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_tSoxgbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2071" identifier="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071" name="Execution Environment" xmi:id="_tTGrkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_tTGrkbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2103" identifier="org.eclipse.papyrus.uml.diagram.composite.Expression_2103" name="Expression" xmi:id="_tTfGELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Expression.gif" xmi:id="_tTfGEbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Expression</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3076" identifier="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076" name="Function Behavior" xmi:id="_tSjR8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif" xmi:id="_tSjR8bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FunctionBehavior</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2064" identifier="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064" name="Function Behavior" xmi:id="_tTDoQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif" xmi:id="_tTDoQbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FunctionBehavior</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015" name="Generalization" xmi:id="_tT1EULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_tT1EUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4021" identifier="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021" name="Information Flow" xmi:id="_tT3gkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_tT3gkbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3094" identifier="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094" name="Information Item" xmi:id="_tS2M4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_tS2M4bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2080" identifier="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080" name="Information Item" xmi:id="_tTOnYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_tTOnYbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2108" identifier="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108" name="Instance Value" xmi:id="_tTiwcLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceValue.gif" xmi:id="_tTiwcbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceValue</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3073" identifier="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073" name="Interaction" xmi:id="_tSfAgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif" xmi:id="_tSfAgbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interaction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2061" identifier="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061" name="Interaction" xmi:id="_tTBMALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif" xmi:id="_tTBMAbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interaction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3119" identifier="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119" name="Interaction Constraint" xmi:id="_tS86kLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionConstraint.gif" xmi:id="_tS86kbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InteractionConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2113" identifier="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113" name="Interaction Constraint" xmi:id="_tTma0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionConstraint.gif" xmi:id="_tTma0bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InteractionConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3087" identifier="org.eclipse.papyrus.uml.diagram.composite.Interface_3087" name="Interface" xmi:id="_tSvfMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_tSvfMbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2076" identifier="org.eclipse.papyrus.uml.diagram.composite.Interface_2076" name="Interface" xmi:id="_tTJu4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_tTJu4bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005" name="Interface Realization" xmi:id="_tTpeILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_tTpeIbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2107" identifier="org.eclipse.papyrus.uml.diagram.composite.Interval_2107" name="Interval" xmi:id="_tTiJYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interval.gif" xmi:id="_tTiJYbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interval</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3118" identifier="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118" name="Interval Constraint" xmi:id="_tS7scLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_tS7scbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2112" identifier="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112" name="Interval Constraint" xmi:id="_tTlzwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_tTlzwbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2095" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095" name="Literal Boolean" xmi:id="_tTXKQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralBoolean.gif" xmi:id="_tTXKQbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LiteralBoolean</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2096" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096" name="Literal Integer" xmi:id="_tTYYYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralInteger.gif" xmi:id="_tTYYYbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LiteralInteger</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2097" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097" name="Literal Null" xmi:id="_tTY_cLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralNull.gif" xmi:id="_tTY_cbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LiteralNull</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2098" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098" name="Literal String" xmi:id="_tTZmgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralString.gif" xmi:id="_tTZmgbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LiteralString</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2099" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099" name="Literal Unlimited Natural" xmi:id="_tTaNkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" xmi:id="_tTaNkbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.LiteralUnlimitedNatural</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012" name="Manifestation" xmi:id="_tTr6YLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_tTr6YbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3084" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3084" name="Node" xmi:id="_tSp_oLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_tSp_obazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2072" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_2072" name="Node" xmi:id="_tTHSoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_tTHSobazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077" name="Opaque Behavior" xmi:id="_tSkgELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_tSkgEbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2065" identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065" name="Opaque Behavior" xmi:id="_tTEPULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_tTEPUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2101" identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101" name="Opaque Expression" xmi:id="_tTd38LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_tTd38bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3102" identifier="org.eclipse.papyrus.uml.diagram.composite.Operation_3102" name="Operation" xmi:id="_tS-vwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_tS-vwbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="CompositeStructure" identifier="org.eclipse.papyrus.uml.diagram.composite.Package_1000" name="Package" xmi:id="_tOrekLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_tOrekbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3088" identifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088" name="Parameter" xmi:id="_tSXEsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_tSXEsbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3069" identifier="org.eclipse.papyrus.uml.diagram.composite.Port_3069" name="Port" xmi:id="_tSVPgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_tSVPgbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078" name="Primitive Type" xmi:id="_tSwtULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_tSwtUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2066" identifier="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066" name="Primitive Type" xmi:id="_tTKV8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_tTKV8bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.uml.diagram.composite.Property_3070" name="Property" xmi:id="_tSYS0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_tSYS0bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3101" identifier="org.eclipse.papyrus.uml.diagram.composite.Property_3101" name="Property" xmi:id="_tS-IsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_tS-IsbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3074" identifier="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074" name="Protocol State Machine" xmi:id="_tSg1sLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" xmi:id="_tSg1sbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ProtocolStateMachine</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2062" identifier="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062" name="Protocol State Machine" xmi:id="_tTBzELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" xmi:id="_tTBzEbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ProtocolStateMachine</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.composite.Realization_4006" name="Realization" xmi:id="_tTrTULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_tTrTUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4020" identifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020" name="Representation" xmi:id="_tT2ScbazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017" name="Role Binding" xmi:id="_tTuWoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_tTuWobazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CollaborationUse.RoleBinding</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3095" identifier="org.eclipse.papyrus.uml.diagram.composite.Signal_3095" name="Signal" xmi:id="_tS2z8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_tS2z8bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2081" identifier="org.eclipse.papyrus.uml.diagram.composite.Signal_2081" name="Signal" xmi:id="_tTPOcLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_tTPOcbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2083" identifier="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083" name="Signal Event" xmi:id="_tTQckLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SignalEvent.gif" xmi:id="_tTQckbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.SignalEvent</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3075" identifier="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075" name="State Machine" xmi:id="_tSiD0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_tSiD0bazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2063" identifier="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063" name="State Machine" xmi:id="_tTCaILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_tTCaIbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2100" identifier="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100" name="String Expression" xmi:id="_tTa0oLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif" xmi:id="_tTa0obazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011" name="Substitution" xmi:id="_tTqFMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_tTqFMbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3117" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117" name="Time Constraint" xmi:id="_tS6eULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_tS6eUbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2111" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111" name="Time Constraint" xmi:id="_tTlMsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_tTlMsbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2089" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089" name="Time Event" xmi:id="_tTTf4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeEvent.gif" xmi:id="_tTUuALazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeEvent</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2102" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102" name="Time Expression" xmi:id="_tTefALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeExpression.gif" xmi:id="_tTefAbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeExpression</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2105" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105" name="Time Interval" xmi:id="_tTg7QLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeInterval.gif" xmi:id="_tTg7QbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeInterval</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2094" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094" name="Time Observation" xmi:id="_tTWjMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif" xmi:id="_tTWjMbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018" name="Time Observation Event" xmi:id="_tT1rYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.composite.Usage_4008" name="Usage" xmi:id="_tTtIgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_tTtIgbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3096" identifier="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096" name="Use Case" xmi:id="_tS4CELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_tS4CEbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2082" identifier="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082" name="Use Case" xmi:id="_tTP1gLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_tTP1gbazEeSbnofizoRSMQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.GeneralizationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice" inheritance="all" xmi:id="_0kx7YLgREeSsJKs23mSE-A" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations description="Property specific advices (remove inconsistent views when a Property type is set" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.PropertyHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice" inheritance="all" xmi:id="_DnjXALgSEeSsJKs23mSE-A" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations description="Collaboration specific advices (remove inconsistent views when a CollaborationRole is removed" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.CollaborationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice" inheritance="all" xmi:id="_Q8xrsLgSEeSsJKs23mSE-A" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">
-    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca07VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>
-  </adviceBindingsConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="CompositeStructure" xmi:id="_tL86sLazEeSbnofizoRSMQ" xmi:version="2.0">

+  <elementTypeConfigurations hint="4007" identifier="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007" name="Abstraction" xmi:id="_tTshcLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_tTshcbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3072" identifier="org.eclipse.papyrus.uml.diagram.composite.Activity_3072" name="Activity" xmi:id="_tSdyYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_tSdyYbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2060" identifier="org.eclipse.papyrus.uml.diagram.composite.Activity_2060" name="Activity" xmi:id="_tTAk8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_tTAk8bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Activity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3091" identifier="org.eclipse.papyrus.uml.diagram.composite.Actor_3091" name="Actor" xmi:id="_tSzwoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_tSzwobazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2077" identifier="org.eclipse.papyrus.uml.diagram.composite.Actor_2077" name="Actor" xmi:id="_tTMyMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_tTMyMbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2085" identifier="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085" name="Any Receive Event" xmi:id="_tTSRwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" xmi:id="_tTSRwbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AnyReceiveEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3093" identifier="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093" name="Artifact" xmi:id="_tS0-wLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_tS0-wbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2079" identifier="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079" name="Artifact" xmi:id="_tTOAULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_tTOAUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2084" identifier="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084" name="Call Event" xmi:id="_tTRqsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_tTRqsbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CallEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2088" identifier="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088" name="Change Event" xmi:id="_tTS40LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_tTS40bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ChangeEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3085" identifier="org.eclipse.papyrus.uml.diagram.composite.Class_3085" name="Class" xmi:id="_tStqALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_tStqAbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2073" identifier="org.eclipse.papyrus.uml.diagram.composite.Class_2073" name="Class" xmi:id="_tTH5sLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_tTH5sbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3086" identifier="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086" name="Collaboration" xmi:id="_tSu4ILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_tSu4IbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2075" identifier="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075" name="Collaboration" xmi:id="_tTJH0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_tTJH0bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3115" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationRole_3115" name="Collaboration Role" xmi:id="_tSZg8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElement.gif" xmi:id="_tSZg8bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Collaboration.CollaborationRole</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071" name="Collaboration Use" xmi:id="_tSb9MLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CollaborationUse.gif" xmi:id="_tSb9MbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CollaborationUse</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3097" identifier="org.eclipse.papyrus.uml.diagram.composite.Comment_3097" name="Comment" xmi:id="_tS4pILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_tS4pIbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2109" identifier="org.eclipse.papyrus.uml.diagram.composite.Comment_2109" name="Comment" xmi:id="_tTj-kLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_tTj-kbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002" name="Comment Annotated Element" xmi:id="_tToQALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3081" identifier="org.eclipse.papyrus.uml.diagram.composite.Component_3081" name="Component" xmi:id="_tSmVQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_tSmVQbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2069" identifier="org.eclipse.papyrus.uml.diagram.composite.Component_2069" name="Component" xmi:id="_tTE2YLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_tTE2YbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004" name="Component Realization" xmi:id="_tTo3ELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif" xmi:id="_tTo3EbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ComponentRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.composite.Connector_4013" name="Connector" xmi:id="_tTwL0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_tTwL0bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Connector</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3120" identifier="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120" name="Constraint" xmi:id="_tS9hoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_tS9hobazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2114" identifier="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114" name="Constraint" xmi:id="_tTnB4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_tTnB4bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003" name="Constraint Constrained Element" xmi:id="_tToQAbazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.uml.diagram.composite.DataType_3080" name="Data Type" xmi:id="_tSzJkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_tSzJkbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2068" identifier="org.eclipse.papyrus.uml.diagram.composite.DataType_2068" name="Data Type" xmi:id="_tTMLILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_tTMLIbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010" name="Dependency" xmi:id="_tTvkwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_tTvkwbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009" name="Deployment" xmi:id="_tTtvkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif" xmi:id="_tTtvkbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Deployment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3092" identifier="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092" name="Deployment Specification" xmi:id="_tS0XsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_tS0XsbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2078" identifier="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078" name="Deployment Specification" xmi:id="_tTNZQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_tTNZQbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3082" identifier="org.eclipse.papyrus.uml.diagram.composite.Device_3082" name="Device" xmi:id="_tSnjYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_tSnjYbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2070" identifier="org.eclipse.papyrus.uml.diagram.composite.Device_2070" name="Device" xmi:id="_tTGEgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_tTGEgbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2104" identifier="org.eclipse.papyrus.uml.diagram.composite.Duration_2104" name="Duration" xmi:id="_tTftILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Duration.gif" xmi:id="_tTftIbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Duration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3116" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116" name="Duration Constraint" xmi:id="_tS5QMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_tS5QMbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2110" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110" name="Duration Constraint" xmi:id="_tTkloLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_tTklobazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2106" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106" name="Duration Interval" xmi:id="_tThiULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationInterval.gif" xmi:id="_tThiUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationInterval</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2093" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093" name="Duration Observation" xmi:id="_tTVVELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif" xmi:id="_tTVVEbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019" name="Duration Observation Event" xmi:id="_tT2ScLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3079" identifier="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079" name="Enumeration" xmi:id="_tSyigLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_tSyigbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2067" identifier="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067" name="Enumeration" xmi:id="_tTK9ALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_tTK9AbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3066" identifier="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066" name="Enumeration Literal" xmi:id="_tS_94LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_tS_94bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3083" identifier="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083" name="Execution Environment" xmi:id="_tSoxgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_tSoxgbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2071" identifier="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071" name="Execution Environment" xmi:id="_tTGrkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_tTGrkbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2103" identifier="org.eclipse.papyrus.uml.diagram.composite.Expression_2103" name="Expression" xmi:id="_tTfGELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Expression.gif" xmi:id="_tTfGEbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Expression</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3076" identifier="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076" name="Function Behavior" xmi:id="_tSjR8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif" xmi:id="_tSjR8bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FunctionBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2064" identifier="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064" name="Function Behavior" xmi:id="_tTDoQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif" xmi:id="_tTDoQbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FunctionBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015" name="Generalization" xmi:id="_tT1EULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_tT1EUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4021" identifier="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021" name="Information Flow" xmi:id="_tT3gkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_tT3gkbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlow</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3094" identifier="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094" name="Information Item" xmi:id="_tS2M4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_tS2M4bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2080" identifier="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080" name="Information Item" xmi:id="_tTOnYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_tTOnYbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationItem</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2108" identifier="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108" name="Instance Value" xmi:id="_tTiwcLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceValue.gif" xmi:id="_tTiwcbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceValue</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3073" identifier="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073" name="Interaction" xmi:id="_tSfAgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif" xmi:id="_tSfAgbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interaction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2061" identifier="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061" name="Interaction" xmi:id="_tTBMALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif" xmi:id="_tTBMAbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interaction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3119" identifier="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119" name="Interaction Constraint" xmi:id="_tS86kLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionConstraint.gif" xmi:id="_tS86kbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InteractionConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2113" identifier="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113" name="Interaction Constraint" xmi:id="_tTma0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionConstraint.gif" xmi:id="_tTma0bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InteractionConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3087" identifier="org.eclipse.papyrus.uml.diagram.composite.Interface_3087" name="Interface" xmi:id="_tSvfMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_tSvfMbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2076" identifier="org.eclipse.papyrus.uml.diagram.composite.Interface_2076" name="Interface" xmi:id="_tTJu4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_tTJu4bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005" name="Interface Realization" xmi:id="_tTpeILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_tTpeIbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InterfaceRealization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2107" identifier="org.eclipse.papyrus.uml.diagram.composite.Interval_2107" name="Interval" xmi:id="_tTiJYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interval.gif" xmi:id="_tTiJYbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interval</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3118" identifier="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118" name="Interval Constraint" xmi:id="_tS7scLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_tS7scbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2112" identifier="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112" name="Interval Constraint" xmi:id="_tTlzwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_tTlzwbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2095" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095" name="Literal Boolean" xmi:id="_tTXKQLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralBoolean.gif" xmi:id="_tTXKQbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralBoolean</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2096" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096" name="Literal Integer" xmi:id="_tTYYYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralInteger.gif" xmi:id="_tTYYYbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralInteger</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2097" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097" name="Literal Null" xmi:id="_tTY_cLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralNull.gif" xmi:id="_tTY_cbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralNull</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2098" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098" name="Literal String" xmi:id="_tTZmgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralString.gif" xmi:id="_tTZmgbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralString</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2099" identifier="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099" name="Literal Unlimited Natural" xmi:id="_tTaNkLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" xmi:id="_tTaNkbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.LiteralUnlimitedNatural</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012" name="Manifestation" xmi:id="_tTr6YLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_tTr6YbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3084" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_3084" name="Node" xmi:id="_tSp_oLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_tSp_obazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2072" identifier="org.eclipse.papyrus.uml.diagram.composite.Node_2072" name="Node" xmi:id="_tTHSoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_tTHSobazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077" name="Opaque Behavior" xmi:id="_tSkgELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_tSkgEbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2065" identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065" name="Opaque Behavior" xmi:id="_tTEPULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_tTEPUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueBehavior</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2101" identifier="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101" name="Opaque Expression" xmi:id="_tTd38LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_tTd38bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OpaqueExpression</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3102" identifier="org.eclipse.papyrus.uml.diagram.composite.Operation_3102" name="Operation" xmi:id="_tS-vwLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_tS-vwbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="CompositeStructure" identifier="org.eclipse.papyrus.uml.diagram.composite.Package_1000" name="Package" xmi:id="_tOrekLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_tOrekbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3088" identifier="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088" name="Parameter" xmi:id="_tSXEsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_tSXEsbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Parameter</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3069" identifier="org.eclipse.papyrus.uml.diagram.composite.Port_3069" name="Port" xmi:id="_tSVPgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_tSVPgbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Port</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078" name="Primitive Type" xmi:id="_tSwtULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_tSwtUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2066" identifier="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066" name="Primitive Type" xmi:id="_tTKV8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_tTKV8bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.uml.diagram.composite.Property_3070" name="Property" xmi:id="_tSYS0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_tSYS0bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3101" identifier="org.eclipse.papyrus.uml.diagram.composite.Property_3101" name="Property" xmi:id="_tS-IsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_tS-IsbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3074" identifier="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074" name="Protocol State Machine" xmi:id="_tSg1sLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" xmi:id="_tSg1sbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ProtocolStateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2062" identifier="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062" name="Protocol State Machine" xmi:id="_tTBzELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" xmi:id="_tTBzEbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ProtocolStateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4006" identifier="org.eclipse.papyrus.uml.diagram.composite.Realization_4006" name="Realization" xmi:id="_tTrTULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_tTrTUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4020" identifier="org.eclipse.papyrus.uml.diagram.composite.Representation_4020" name="Representation" xmi:id="_tT2ScbazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017" name="Role Binding" xmi:id="_tTuWoLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_tTuWobazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CollaborationUse.RoleBinding</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3095" identifier="org.eclipse.papyrus.uml.diagram.composite.Signal_3095" name="Signal" xmi:id="_tS2z8LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_tS2z8bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2081" identifier="org.eclipse.papyrus.uml.diagram.composite.Signal_2081" name="Signal" xmi:id="_tTPOcLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_tTPOcbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Signal</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2083" identifier="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083" name="Signal Event" xmi:id="_tTQckLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SignalEvent.gif" xmi:id="_tTQckbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.SignalEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3075" identifier="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075" name="State Machine" xmi:id="_tSiD0LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_tSiD0bazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2063" identifier="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063" name="State Machine" xmi:id="_tTCaILazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_tTCaIbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2100" identifier="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100" name="String Expression" xmi:id="_tTa0oLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif" xmi:id="_tTa0obazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011" name="Substitution" xmi:id="_tTqFMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_tTqFMbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Substitution</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3117" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117" name="Time Constraint" xmi:id="_tS6eULazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_tS6eUbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2111" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111" name="Time Constraint" xmi:id="_tTlMsLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_tTlMsbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2089" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089" name="Time Event" xmi:id="_tTTf4LazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeEvent.gif" xmi:id="_tTUuALazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeEvent</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2102" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102" name="Time Expression" xmi:id="_tTefALazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeExpression.gif" xmi:id="_tTefAbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeExpression</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2105" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105" name="Time Interval" xmi:id="_tTg7QLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeInterval.gif" xmi:id="_tTg7QbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeInterval</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2094" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094" name="Time Observation" xmi:id="_tTWjMLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif" xmi:id="_tTWjMbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeObservation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018" name="Time Observation Event" xmi:id="_tT1rYLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.composite.Usage_4008" name="Usage" xmi:id="_tTtIgLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_tTtIgbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3096" identifier="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096" name="Use Case" xmi:id="_tS4CELazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_tS4CEbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2082" identifier="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082" name="Use Case" xmi:id="_tTP1gLazEeSbnofizoRSMQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_tTP1gbazEeSbnofizoRSMQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.GeneralizationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice" inheritance="all" xmi:id="_0kx7YLgREeSsJKs23mSE-A" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="Property specific advices (remove inconsistent views when a Property type is set" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.PropertyHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice" inheritance="all" xmi:id="_DnjXALgSEeSsJKs23mSE-A" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="Collaboration specific advices (remove inconsistent views when a CollaborationRole is removed" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.CollaborationHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice" inheritance="all" xmi:id="_Q8xrsLgSEeSsJKs23mSE-A" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca07VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index 47439945aa0..d7c3411e8f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -946,14 +946,14 @@
    </semanticChildrenStrategy>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    		clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/compositediagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/compositediagram-notation.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations
index 05d7299b2b1..f58db1738ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram-notation.elementtypesconfigurations
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_rcmpgv_cEeS2GcUTq58BKg" xmi:version="2.0">
-  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.deployment.Link_4005" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Undefined" xmi:id="_rcnQkP_cEeS2GcUTq58BKg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_rcmpgv_cEeS2GcUTq58BKg" xmi:version="2.0">

+  <elementTypeConfigurations hint="4005" identifier="org.eclipse.papyrus.uml.diagram.deployment.Link_4005" kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType" name="Undefined" xmi:id="_rcnQkP_cEeS2GcUTq58BKg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations
index 1c9dadf6a2b..95ed3116b1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/DeploymentDiagram.elementtypesconfigurations
@@ -1,144 +1,144 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLDeploymentDiagram" xmi:id="_gvIwYP8PEeS2nvlxgM4H8g" xmi:version="2.0">
-  <elementTypeConfigurations hint="25" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_25" name="Artifact" xmi:id="_gwBhMP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwBhMf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="28" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_28" name="Artifact" xmi:id="_gwCIQP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwCIQf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="40" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_40" name="Artifact" xmi:id="_gwCIQv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwCIQ_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006" name="Artifact" xmi:id="_gwGZsv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwGZs_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="54" identifier="org.eclipse.papyrus.uml.diagram.deployment.Comment_54" name="Comment" xmi:id="_gwCvUP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_gwCvUf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.uml.diagram.deployment.Comment_2001" name="Comment" xmi:id="_gwFLkv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_gwFLk_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.deployment.CommentAnnotatedElement_4006" name="Comment Annotated Element" xmi:id="_gwHn0P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.deployment.CommunicationPath_4011" name="CommunicationPath" xmi:id="_8sxJcDSEEeWt899Q4ouxaA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CommunicationPath.gif" xmi:id="_MLL_QDSFEeWt899Q4ouxaA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.CommunicationPath</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="56" identifier="org.eclipse.papyrus.uml.diagram.deployment.Constraint_56" name="Constraint" xmi:id="_gwDWYP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_gwDWYf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.deployment.Constraint_2005" name="Constraint" xmi:id="_gwFLkP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_gwFLkf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.deployment.ConstraintConstrainedElement_4007" name="Constraint Constrained Element" xmi:id="_gwHn0f8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.uml.diagram.deployment.NamedElement_2012" name="Default Named Element" xmi:id="_gwHAwv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_gwHAw_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4010" name="Dependency Branch Link" xmi:id="_gwI18v8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_gwI18_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4004" name="Dependency Link" xmi:id="_gwI18P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_gwI18f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011" name="Dependency Node" xmi:id="_gwD9cP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_gwD9cf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.deployment.Deployment_4001" name="Deployment" xmi:id="_gwHn0v8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif" xmi:id="_gwHn0_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Deployment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2013" name="DeploymentSpecification" xmi:id="_H3PAAEvtEeWDlLIkRlZnAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_NrvVQEvtEeWDlLIkRlZnAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2014" name="DeploymentSpecification" xmi:id="_CafvEEwwEeWwb_6uOhatZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_bp_zEEyhEeW-zLOt2X96xQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2015" name="DeploymentSpecification" xmi:id="_dGBFIEyhEeW-zLOt2X96xQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_dGBFIUyhEeW-zLOt2X96xQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2016" name="DeploymentSpecification" xmi:id="_GKvkwEy4EeWcB5wRNPiyyQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_GKwL0Ey4EeWcB5wRNPiyyQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="16" identifier="org.eclipse.papyrus.uml.diagram.deployment.Device_16" name="Device" xmi:id="_gv-d4P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_gv-d4f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="44" identifier="org.eclipse.papyrus.uml.diagram.deployment.Device_44" name="Device" xmi:id="_gv_E8P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_gv_E8f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2003" identifier="org.eclipse.papyrus.uml.diagram.deployment.Device_2003" name="Device" xmi:id="_gwGZsP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_gwGZsf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="21" identifier="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_21" name="Execution Environment" xmi:id="_gv_sAP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_gv_sAf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="46" identifier="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_46" name="Execution Environment" xmi:id="_gv_sAv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_gv_sA_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2002" identifier="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_2002" name="Execution Environment" xmi:id="_gwFyoP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_gwFyof8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.deployment.Generalization_4003" name="Generalization" xmi:id="_gwIO4P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_gwIO4f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.deployment.Manifestation_4002" name="Manifestation" xmi:id="_gwHn1P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_gwHn1f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="49" identifier="org.eclipse.papyrus.uml.diagram.deployment.Model_49" name="Model" xmi:id="_gv9PwP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_gv9Pwf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.deployment.Model_2010" name="Model" xmi:id="_gwD9cv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_gwD9c_8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="23" identifier="org.eclipse.papyrus.uml.diagram.deployment.Node_23" name="Node" xmi:id="_gwATEP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_gwATEf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="42" identifier="org.eclipse.papyrus.uml.diagram.deployment.Node_42" name="Node" xmi:id="_gwA6IP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_gwA6If8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.deployment.Node_2008" name="Node" xmi:id="_gwHAwP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_gwHAwf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLDeploymentDiagram" identifier="org.eclipse.papyrus.uml.diagram.deployment.Package_1000" name="Package" xmi:id="_gv0s4P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_gv0s4f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="36" identifier="org.eclipse.papyrus.uml.diagram.deployment.Package_36" name="Package" xmi:id="_gv920P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_gv920f8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.deployment.Package_2009" name="Package" xmi:id="_gwEkgP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_gwEkgf8PEeS2nvlxgM4H8g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.deployment.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLDeploymentDiagram" xmi:id="_gvIwYP8PEeS2nvlxgM4H8g" xmi:version="2.0">

+  <elementTypeConfigurations hint="25" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_25" name="Artifact" xmi:id="_gwBhMP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwBhMf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="28" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_28" name="Artifact" xmi:id="_gwCIQP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwCIQf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="40" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_40" name="Artifact" xmi:id="_gwCIQv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwCIQ_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.deployment.Artifact_2006" name="Artifact" xmi:id="_gwGZsv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_gwGZs_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Artifact</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="54" identifier="org.eclipse.papyrus.uml.diagram.deployment.Comment_54" name="Comment" xmi:id="_gwCvUP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_gwCvUf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.uml.diagram.deployment.Comment_2001" name="Comment" xmi:id="_gwFLkv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_gwFLk_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.deployment.CommentAnnotatedElement_4006" name="Comment Annotated Element" xmi:id="_gwHn0P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.deployment.CommunicationPath_4011" name="CommunicationPath" xmi:id="_8sxJcDSEEeWt899Q4ouxaA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CommunicationPath.gif" xmi:id="_MLL_QDSFEeWt899Q4ouxaA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.CommunicationPath</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="56" identifier="org.eclipse.papyrus.uml.diagram.deployment.Constraint_56" name="Constraint" xmi:id="_gwDWYP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_gwDWYf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.deployment.Constraint_2005" name="Constraint" xmi:id="_gwFLkP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_gwFLkf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.deployment.ConstraintConstrainedElement_4007" name="Constraint Constrained Element" xmi:id="_gwHn0f8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.uml.diagram.deployment.NamedElement_2012" name="Default Named Element" xmi:id="_gwHAwv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_gwHAw_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4010" name="Dependency Branch Link" xmi:id="_gwI18v8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_gwI18_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.uml.diagram.deployment.Dependency_4004" name="Dependency Link" xmi:id="_gwI18P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_gwI18f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.uml.diagram.deployment.Dependency_2011" name="Dependency Node" xmi:id="_gwD9cP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_gwD9cf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.deployment.Deployment_4001" name="Deployment" xmi:id="_gwHn0v8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif" xmi:id="_gwHn0_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Deployment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2013" name="DeploymentSpecification" xmi:id="_H3PAAEvtEeWDlLIkRlZnAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_NrvVQEvtEeWDlLIkRlZnAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2014" name="DeploymentSpecification" xmi:id="_CafvEEwwEeWwb_6uOhatZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_bp_zEEyhEeW-zLOt2X96xQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2015" name="DeploymentSpecification" xmi:id="_dGBFIEyhEeW-zLOt2X96xQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_dGBFIUyhEeW-zLOt2X96xQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.deployment.DeploymentSpecification_2016" name="DeploymentSpecification" xmi:id="_GKvkwEy4EeWcB5wRNPiyyQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_GKwL0Ey4EeWcB5wRNPiyyQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DeploymentSpecification</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="16" identifier="org.eclipse.papyrus.uml.diagram.deployment.Device_16" name="Device" xmi:id="_gv-d4P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_gv-d4f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="44" identifier="org.eclipse.papyrus.uml.diagram.deployment.Device_44" name="Device" xmi:id="_gv_E8P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_gv_E8f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2003" identifier="org.eclipse.papyrus.uml.diagram.deployment.Device_2003" name="Device" xmi:id="_gwGZsP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_gwGZsf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="21" identifier="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_21" name="Execution Environment" xmi:id="_gv_sAP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_gv_sAf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="46" identifier="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_46" name="Execution Environment" xmi:id="_gv_sAv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_gv_sA_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2002" identifier="org.eclipse.papyrus.uml.diagram.deployment.ExecutionEnvironment_2002" name="Execution Environment" xmi:id="_gwFyoP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_gwFyof8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.uml.diagram.deployment.Generalization_4003" name="Generalization" xmi:id="_gwIO4P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_gwIO4f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.deployment.Manifestation_4002" name="Manifestation" xmi:id="_gwHn1P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_gwHn1f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Manifestation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="49" identifier="org.eclipse.papyrus.uml.diagram.deployment.Model_49" name="Model" xmi:id="_gv9PwP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_gv9Pwf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.deployment.Model_2010" name="Model" xmi:id="_gwD9cv8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_gwD9c_8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="23" identifier="org.eclipse.papyrus.uml.diagram.deployment.Node_23" name="Node" xmi:id="_gwATEP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_gwATEf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="42" identifier="org.eclipse.papyrus.uml.diagram.deployment.Node_42" name="Node" xmi:id="_gwA6IP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_gwA6If8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.deployment.Node_2008" name="Node" xmi:id="_gwHAwP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_gwHAwf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLDeploymentDiagram" identifier="org.eclipse.papyrus.uml.diagram.deployment.Package_1000" name="Package" xmi:id="_gv0s4P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_gv0s4f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="36" identifier="org.eclipse.papyrus.uml.diagram.deployment.Package_36" name="Package" xmi:id="_gv920P8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_gv920f8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.deployment.Package_2009" name="Package" xmi:id="_gwEkgP8PEeS2nvlxgM4H8g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_gwEkgf8PEeS2nvlxgM4H8g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
index 9525a8b604f..8295be7d945 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/plugin.xml
@@ -747,14 +747,14 @@
    </diagramReconciler>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/DeploymentDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/DeploymentDiagram-notation.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
index de4ccbf902a..2368b688837 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF
@@ -55,7 +55,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
index b02b6ffda0d..d065929aa1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="elementTypeSet" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" xmi:version="2.0">
-  <elementTypeConfigurations hint="5000" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice" xmi:id="_FYd2YGpzEeSbA6Db03aufw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="5005" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" xmi:id="_QywZsOm6EeSdwvyVD4uXcQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_sFytEOm6EeSdwvyVD4uXcQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" target="_QywZsOm6EeSdwvyVD4uXcQ" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="elementTypeSet" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" xmi:version="2.0">

+  <elementTypeConfigurations hint="5000" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_5000" xmi:id="_x8G0yWaNEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_x8G0ymaNEeSyJIsxLao1Pw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice" xmi:id="_FYd2YGpzEeSbA6Db03aufw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="5005" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" name="org.eclipse.papyrus.uml.diagram.interactionoverview.CallBehaviorAction_As_InteractionUse_5005" xmi:id="_QywZsOm6EeSdwvyVD4uXcQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_sFytEOm6EeSdwvyVD4uXcQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" target="_QywZsOm6EeSdwvyVD4uXcQ" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
index a90f16750f7..d553e3db256 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -721,7 +721,7 @@
    </diagramMappings>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/interactionOverviewDiagram.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations
index 295ddf04001..3d0f2c40621 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.elementtypesconfigurations
@@ -1,171 +1,171 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.profile.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLProfileDiagram" xmi:id="_MKAB8ORAEeSg9_CuHKArkw" xmi:version="2.0">
-  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_4001" name="Association" xmi:id="_MRnF0ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRnF0eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_4019" name="Association Branch" xmi:id="_MRo7AORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRo7AeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_2015" name="Association Node" xmi:id="_MRLoAORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRLoAeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.profile.Class_3010" name="Class" xmi:id="_MQ_awORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MQ_aweRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.profile.Class_2008" name="Class" xmi:id="_MRM2IORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRM2IeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1007" identifier="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007" name="Comment" xmi:id="_MRB3AORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_MRB3AeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1002" identifier="org.eclipse.papyrus.uml.diagram.profile.Comment_1002" name="Comment" xmi:id="_MROrUORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_MROrUeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1022" identifier="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022" name="Comment Annotated Element" xmi:id="_MSWFoORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1028" identifier="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028" name="Constraint" xmi:id="_MRGIcORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_MRGIceRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1014" identifier="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014" name="Constraint" xmi:id="_MRPSYORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_MRPSYeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014" name="Constraint Constrained Element" xmi:id="_MSWssORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500" name="Constraint Context" xmi:id="_MSWsseRAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.profile.DataType_3027" name="Data Type" xmi:id="_MRIksORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_MRIkseRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.profile.DataType_2010" name="Data Type" xmi:id="_MRUK4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_MRUK4eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014" name="Dependency" xmi:id="_MRKZ4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRKZ4eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008" name="Dependency" xmi:id="_MRqJIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRqJIeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018" name="Dependency" xmi:id="_MRqwMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRqwMeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1064" identifier="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064" name="Element Import" xmi:id="_MRr-UORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_MRr-UeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ElementImport</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025" name="Enumeration" xmi:id="_MRHWkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_MRHWkeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006" name="Enumeration" xmi:id="_MRS8wORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_MRS8weRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1037" identifier="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037" name="Enumeration Literal" xmi:id="_MQ6iQORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_MQ6iQeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1013" identifier="org.eclipse.papyrus.uml.diagram.profile.Extension_1013" name="Extension" xmi:id="_MRl3sORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif" xmi:id="_MRl3seRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Extension</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002" name="Generalization" xmi:id="_MRpiEORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_MRpiEeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3028" identifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028" name="Metaclass" xmi:id="_MRAo4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRAo4eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1031" identifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031" name="Metaclass" xmi:id="_MRNdMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRNdMeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1027" identifier="org.eclipse.papyrus.uml.diagram.profile.Model_1027" name="Model" xmi:id="_MRDFIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_MRDFIeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.profile.Model_2005" name="Model" xmi:id="_MRQggORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_MRQggeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019" name="Operation" xmi:id="_MQ3e8ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_MQ3e8eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020" name="Operation" xmi:id="_MQ9lkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_MQ9lkeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1012" identifier="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012" name="Package" xmi:id="_MRE6UORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_MRE6UeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2007" identifier="org.eclipse.papyrus.uml.diagram.profile.Package_1004" name="Package" xmi:id="_MRSVsORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_MRSVseRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1065" identifier="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065" name="Package Import" xmi:id="_MRslYORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_MRslYeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026" name="Primitive Type" xmi:id="_MQ1CsORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_MQ1CseRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009" name="Primitive Type" xmi:id="_MRTj0ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_MRTj0eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLProfileDiagram" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1000" name="Profile" xmi:id="_MQlyIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MQmZMORAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1024" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1024" name="Profile" xmi:id="_MRDsMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MRDsMeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1030" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1030" name="Profile" xmi:id="_MRRHkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MRRHkeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1045" identifier="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045" name="Profile Application" xmi:id="_MRns4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_MRns4eRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ProfileApplication</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018" name="Property" xmi:id="_MQ7JUORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_MQ7JUeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002" name="Property" xmi:id="_MQ8XcORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_MQ8XceRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016" name="Short Cut Diagram" xmi:id="_MRkCgORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Diagram.gif" xmi:id="_MRkCgeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1023" identifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023" name="Stereotype" xmi:id="_MQ-MoORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_MQ-MoeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="1026" identifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026" name="Stereotype" xmi:id="_MRMPEORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_MRMPEeRAEeSg9_CuHKArkw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.profile.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLProfileDiagram" xmi:id="_MKAB8ORAEeSg9_CuHKArkw" xmi:version="2.0">

+  <elementTypeConfigurations hint="4001" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_4001" name="Association" xmi:id="_MRnF0ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRnF0eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_4019" name="Association Branch" xmi:id="_MRo7AORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRo7AeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.profile.Association_2015" name="Association Node" xmi:id="_MRLoAORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_MRLoAeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.profile.Class_3010" name="Class" xmi:id="_MQ_awORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MQ_aweRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2008" identifier="org.eclipse.papyrus.uml.diagram.profile.Class_2008" name="Class" xmi:id="_MRM2IORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRM2IeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1007" identifier="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007" name="Comment" xmi:id="_MRB3AORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_MRB3AeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1002" identifier="org.eclipse.papyrus.uml.diagram.profile.Comment_1002" name="Comment" xmi:id="_MROrUORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_MROrUeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1022" identifier="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022" name="Comment Annotated Element" xmi:id="_MSWFoORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1028" identifier="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028" name="Constraint" xmi:id="_MRGIcORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_MRGIceRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1014" identifier="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014" name="Constraint" xmi:id="_MRPSYORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_MRPSYeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014" name="Constraint Constrained Element" xmi:id="_MSWssORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.profile.ConstraintContext_8500" name="Constraint Context" xmi:id="_MSWsseRAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3027" identifier="org.eclipse.papyrus.uml.diagram.profile.DataType_3027" name="Data Type" xmi:id="_MRIksORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_MRIkseRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2010" identifier="org.eclipse.papyrus.uml.diagram.profile.DataType_2010" name="Data Type" xmi:id="_MRUK4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_MRUK4eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014" name="Dependency" xmi:id="_MRKZ4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRKZ4eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008" name="Dependency" xmi:id="_MRqJIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRqJIeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018" name="Dependency" xmi:id="_MRqwMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_MRqwMeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1064" identifier="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064" name="Element Import" xmi:id="_MRr-UORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_MRr-UeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ElementImport</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3025" identifier="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025" name="Enumeration" xmi:id="_MRHWkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_MRHWkeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2006" identifier="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006" name="Enumeration" xmi:id="_MRS8wORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_MRS8weRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Enumeration</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1037" identifier="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037" name="Enumeration Literal" xmi:id="_MQ6iQORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_MQ6iQeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.EnumerationLiteral</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1013" identifier="org.eclipse.papyrus.uml.diagram.profile.Extension_1013" name="Extension" xmi:id="_MRl3sORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif" xmi:id="_MRl3seRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Extension</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4002" identifier="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002" name="Generalization" xmi:id="_MRpiEORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_MRpiEeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3028" identifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028" name="Metaclass" xmi:id="_MRAo4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRAo4eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1031" identifier="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031" name="Metaclass" xmi:id="_MRNdMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_MRNdMeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1027" identifier="org.eclipse.papyrus.uml.diagram.profile.Model_1027" name="Model" xmi:id="_MRDFIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_MRDFIeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2005" identifier="org.eclipse.papyrus.uml.diagram.profile.Model_2005" name="Model" xmi:id="_MRQggORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_MRQggeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Model</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019" name="Operation" xmi:id="_MQ3e8ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_MQ3e8eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020" name="Operation" xmi:id="_MQ9lkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_MQ9lkeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1012" identifier="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012" name="Package" xmi:id="_MRE6UORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_MRE6UeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2007" identifier="org.eclipse.papyrus.uml.diagram.profile.Package_1004" name="Package" xmi:id="_MRSVsORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_MRSVseRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1065" identifier="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065" name="Package Import" xmi:id="_MRslYORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_MRslYeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3026" identifier="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026" name="Primitive Type" xmi:id="_MQ1CsORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_MQ1CseRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2009" identifier="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009" name="Primitive Type" xmi:id="_MRTj0ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_MRTj0eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PrimitiveType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLProfileDiagram" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1000" name="Profile" xmi:id="_MQlyIORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MQmZMORAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1024" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1024" name="Profile" xmi:id="_MRDsMORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MRDsMeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1030" identifier="org.eclipse.papyrus.uml.diagram.profile.Profile_1030" name="Profile" xmi:id="_MRRHkORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_MRRHkeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Profile</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1045" identifier="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045" name="Profile Application" xmi:id="_MRns4ORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_MRns4eRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ProfileApplication</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018" name="Property" xmi:id="_MQ7JUORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_MQ7JUeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002" name="Property" xmi:id="_MQ8XcORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_MQ8XceRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016" name="Short Cut Diagram" xmi:id="_MRkCgORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Diagram.gif" xmi:id="_MRkCgeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1023" identifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023" name="Stereotype" xmi:id="_MQ-MoORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_MQ-MoeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="1026" identifier="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026" name="Stereotype" xmi:id="_MRMPEORAEeSg9_CuHKArkw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_MRMPEeRAEeSg9_CuHKArkw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Stereotype</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
index 09e3eee65d5..66d2797748b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml
@@ -971,7 +971,7 @@
    </ParserProvider>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/profilediagram.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
index 92aa3ace960..e91000e4833 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.statemachine.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLStateMachineDiagram" xmi:id="_wYwtMMeDEeSwP_9Vn5UnWg" xmi:version="2.0">
-  <elementTypeConfigurations hint="666" identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment" name="Comment" xmi:id="_whhAkMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_whhAkceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="667" identifier="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667" name="Comment Annotated Element" xmi:id="_whtN0MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="18000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000" name="Connection Point Reference" xmi:id="_whfycMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif" xmi:id="_whfycceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ConnectionPointReference</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="668" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668" name="Constraint" xmi:id="_whi1wMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_whi1wceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="670" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670" name="Constraint Constrained Element" xmi:id="_wht04MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500" name="Constraint Context" xmi:id="_wht04ceDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="691" identifier="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691" name="Do Activity State Behavior" xmi:id="_whnuQMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_whnuQceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="690" identifier="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690" name="Entry State Behavior" xmi:id="_whmgIMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_whmgIceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::entry</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="692" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692" name="Exit State Behavior" xmi:id="_who8YMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_who8YceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::exit</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="5000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000" name="Final State" xmi:id="_whMQcMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif" xmi:id="_whMQcceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.FinalState</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="19000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000" name="Generalization" xmi:id="_whsmwMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_whsmwceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="680" identifier="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680" name="Internal Transition" xmi:id="_whkq8MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition.gif" xmi:id="_whkq8ceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Transition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="PapyrusUMLStateMachineDiagram" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000" name="Package" xmi:id="_wc3KEMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_wc3KEceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="8000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000" name="Pseudostate" xmi:id="_whPTwMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whPTwceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="9000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000" name="Pseudostate" xmi:id="_whRI8MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whRI8ceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="10000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000" name="Pseudostate" xmi:id="_whS-IMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whS-IceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="11000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000" name="Pseudostate" xmi:id="_whUMQMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whUMQceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="12000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000" name="Pseudostate" xmi:id="_whWBcMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whWBcceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="13000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000" name="Pseudostate" xmi:id="_whXPkMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whXPkceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="14000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000" name="Pseudostate" xmi:id="_whZEwMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whZEwceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="15000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000" name="Pseudostate" xmi:id="_wha58MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_wha58ceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="16000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000" name="Pseudostate" xmi:id="_whcvIMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whcvIceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="17000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000" name="Pseudostate" xmi:id="_whd9QMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whd9QceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000" name="Region" xmi:id="_whH_AMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif" xmi:id="_whH_AceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Region</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="6000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.State_6000" name="State" xmi:id="_whOFoMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif" xmi:id="_whOFoceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.State</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000" name="State Machine" xmi:id="_whqKgMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_whqKgceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="7000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000" name="Transition" xmi:id="_whrYoMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition.gif" xmi:id="_whrYoceDEeSwP_9Vn5UnWg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Transition</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="org.eclipse.papyrus.uml.BasePseudostateType" identifier="org.eclipse.papyrus.uml.BasePseudostateType" name="org.eclipse.papyrus.uml.BasePseudostateType" xmi:id="_QoNH8NI_EeSQKMzCpfBfWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Pseudostate</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice" xmi:id="_EIBgsNJGEeSGnIOah6qfxQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" inheritance="all" target="_whqKgMeDEeSwP_9Vn5UnWg" xmi:id="_Gdt5EMf7EeSG9OkAifWKOg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" inheritance="all" target="_whOFoMeDEeSwP_9Vn5UnWg" xmi:id="_3RjqQMwTEeSyj5ums1L-vQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.statemachine.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="PapyrusUMLStateMachineDiagram" xmi:id="_wYwtMMeDEeSwP_9Vn5UnWg" xmi:version="2.0">

+  <elementTypeConfigurations hint="666" identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachineComment" name="Comment" xmi:id="_whhAkMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_whhAkceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="667" identifier="org.eclipse.papyrus.uml.diagram.statemachine.CommentAnnotatedElement_667" name="Comment Annotated Element" xmi:id="_whtN0MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="18000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConnectionPointReference_18000" name="Connection Point Reference" xmi:id="_whfycMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif" xmi:id="_whfycceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ConnectionPointReference</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="668" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Constraint_668" name="Constraint" xmi:id="_whi1wMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_whi1wceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="670" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintConstrainedElement_670" name="Constraint Constrained Element" xmi:id="_wht04MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="8500" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ConstraintContext_8500" name="Constraint Context" xmi:id="_wht04ceDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.Context</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="691" identifier="org.eclipse.papyrus.uml.diagram.statemachine.DoActivityStateBehavior_691" name="Do Activity State Behavior" xmi:id="_whnuQMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_whnuQceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="690" identifier="org.eclipse.papyrus.uml.diagram.statemachine.EntryStateBehavior_690" name="Entry State Behavior" xmi:id="_whmgIMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_whmgIceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::entry</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="692" identifier="org.eclipse.papyrus.uml.diagram.statemachine.ExitStateBehavior_692" name="Exit State Behavior" xmi:id="_who8YMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_who8YceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior_As_UML::State::exit</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="5000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.FinalState_5000" name="Final State" xmi:id="_whMQcMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif" xmi:id="_whMQcceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.FinalState</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="19000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Generalization_19000" name="Generalization" xmi:id="_whsmwMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_whsmwceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="680" identifier="org.eclipse.papyrus.uml.diagram.statemachine.InternalTransition_680" name="Internal Transition" xmi:id="_whkq8MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition.gif" xmi:id="_whkq8ceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Transition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="PapyrusUMLStateMachineDiagram" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Package_1000" name="Package" xmi:id="_wc3KEMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_wc3KEceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="8000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_8000" name="Pseudostate" xmi:id="_whPTwMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whPTwceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="9000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_9000" name="Pseudostate" xmi:id="_whRI8MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whRI8ceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="10000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_10000" name="Pseudostate" xmi:id="_whS-IMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whS-IceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="11000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_11000" name="Pseudostate" xmi:id="_whUMQMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whUMQceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="12000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_12000" name="Pseudostate" xmi:id="_whWBcMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whWBcceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="13000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_13000" name="Pseudostate" xmi:id="_whXPkMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whXPkceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="14000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_14000" name="Pseudostate" xmi:id="_whZEwMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whZEwceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="15000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_15000" name="Pseudostate" xmi:id="_wha58MeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_wha58ceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="16000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_16000" name="Pseudostate" xmi:id="_whcvIMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whcvIceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="17000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Pseudostate_17000" name="Pseudostate" xmi:id="_whd9QMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_whd9QceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.BasePseudostateType</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Region_3000" name="Region" xmi:id="_whH_AMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif" xmi:id="_whH_AceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Region</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="6000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.State_6000" name="State" xmi:id="_whOFoMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif" xmi:id="_whOFoceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.State</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.StateMachine_2000" name="State Machine" xmi:id="_whqKgMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_whqKgceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StateMachine</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="7000" identifier="org.eclipse.papyrus.uml.diagram.statemachine.Transition_7000" name="Transition" xmi:id="_whrYoMeDEeSwP_9Vn5UnWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition.gif" xmi:id="_whrYoceDEeSwP_9Vn5UnWg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Transition</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="org.eclipse.papyrus.uml.BasePseudostateType" identifier="org.eclipse.papyrus.uml.BasePseudostateType" name="org.eclipse.papyrus.uml.BasePseudostateType" xmi:id="_QoNH8NI_EeSQKMzCpfBfWg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Pseudostate</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice" xmi:id="_EIBgsNJGEeSGnIOah6qfxQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" inheritance="all" target="_whqKgMeDEeSwP_9Vn5UnWg" xmi:id="_Gdt5EMf7EeSG9OkAifWKOg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" inheritance="all" target="_whOFoMeDEeSwP_9Vn5UnWg" xmi:id="_3RjqQMwTEeSyj5ums1L-vQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 7ec75f752f1..9e35c542492 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -855,7 +855,7 @@
 
 
     <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="model/stateMachineDiagram.elementtypesconfigurations">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index ce0e7828442..8ea0e30f2ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -76,7 +76,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
  org.eclipse.core.databinding.observable,
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations
index e8f1e7ed5ca..2532ac6ff9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram-notation.elementtypesconfigurations
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_qxKXgFkiEeSozs_wDdvj0g" xmi:version="2.0">
-  <elementTypeConfigurations hint="2019" identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" name="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" xmi:id="_qxK-pFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSetNotation" metamodelNsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" name="elementTypeSetNotation" xmi:id="_qxKXgFkiEeSozs_wDdvj0g" xmi:version="2.0">

+  <elementTypeConfigurations hint="2019" identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" name="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" xmi:id="_qxK-pFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations
index e0b0b5898dd..c551e5cb989 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.elementtypesconfigurations
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UseCase" xmi:id="_qxKXgFkiEeSozs_wDdvj0g" xmi:version="2.0">
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007" name="Extension Point" xmi:id="_qxKXgVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_qxKXglkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008" name="Extension Point" xmi:id="_qxKXg1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_qxKXhFkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3009" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009" name="Use Case" xmi:id="_qxKXhVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_qxKXhlkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3016" identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3016" name="Component" xmi:id="_qxKXh1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_qxKXiFkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3015" identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015" name="Comment" xmi:id="_qxKXiVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_qxKXilkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3017" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017" name="Constraint" xmi:id="_qxKXi1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_qxKXjFkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018" name="Actor" xmi:id="_qxKXjVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_qxKXjlkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010" name="Constraint" xmi:id="_qxKXj1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_qxKXkFkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011" name="Actor" xmi:id="_qxKXkVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_qxKXklkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012" name="Use Case" xmi:id="_qxKXk1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_qxKXlFkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3013" name="Component" xmi:id="_qxKXlVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_qxKXllkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_3014" name="Package" xmi:id="_qxK-kFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_qxK-kVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011" name="Actor" xmi:id="_qxK-klkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_qxK-k1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012" name="Actor as Classifier" xmi:id="_qxK-lFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.papyrus.uml.diagram.usecase" iconPath="/icons/obj16/Actor_as_Classifier.gif" xmi:id="_qxK-lVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013" name="Use Case" xmi:id="_qxK-llkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_qxK-l1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014" name="Use Case as Classifier" xmi:id="_qxK-mFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.papyrus.uml.diagram.usecase" iconPath="/icons/obj16/UseCase_as_Classifier.gif" xmi:id="_qxK-mVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015" name="Classifier" xmi:id="_qxK-mlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Classifier.gif" xmi:id="_qxK-m1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Classifier</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_2016" name="Package" xmi:id="_qxK-nFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_qxK-nVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2017" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017" name="Constraint" xmi:id="_qxK-nlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_qxK-n1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2018" identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018" name="Comment" xmi:id="_qxK-oFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_qxK-oVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2022" identifier="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022" name="Default Named Element" xmi:id="_qxK-olkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_qxK-o1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2019" identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" name="Short Cut Diagram" xmi:id="_qxK-pFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.usecase.Include_4008" name="Include" xmi:id="_qxK-plkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Include.gif" xmi:id="_qxK-p1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Include</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009" name="Extend" xmi:id="_qxK-qFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif" xmi:id="_qxK-qVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Extend</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010" name="Generalization" xmi:id="_qxK-qlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_qxK-q1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.usecase.Association_4011" name="Association" xmi:id="_qxK-rFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_qxK-rVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013" name="Dependency" xmi:id="_qxK-rlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_qxK-r1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015" name="Abstraction" xmi:id="_qxK-sFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_qxK-sVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4016" identifier="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016" name="Usage" xmi:id="_qxK-slkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_qxK-s1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017" name="Realization" xmi:id="_qxK-tFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_qxK-tVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018" name="Package Merge" xmi:id="_qxK-tlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_qxK-t1kiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageMerge</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019" name="Package Import" xmi:id="_qxK-uFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_qxK-uVkiEeSozs_wDdvj0g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014" name="Comment Annotated Element" xmi:id="_HAqeSGqFEeS1S7nMA1LVzg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012" name="Constraint Constrained Element" xmi:id="_HAqeRWqFEeS1S7nMA1LVzg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UseCase" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_1000" name="Package" xmi:id="_ewRrIK_rEeSWIf43-VACFg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_ewRrIa_rEeSWIf43-VACFg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.diagram.usecase.elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UseCase" xmi:id="_qxKXgFkiEeSozs_wDdvj0g" xmi:version="2.0">

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007" name="Extension Point" xmi:id="_qxKXgVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_qxKXglkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008" name="Extension Point" xmi:id="_qxKXg1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_qxKXhFkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3009" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3009" name="Use Case" xmi:id="_qxKXhVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_qxKXhlkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3016" identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3016" name="Component" xmi:id="_qxKXh1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_qxKXiFkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3015" identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_3015" name="Comment" xmi:id="_qxKXiVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_qxKXilkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3017" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3017" name="Constraint" xmi:id="_qxKXi1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_qxKXjFkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3018" name="Actor" xmi:id="_qxKXjVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_qxKXjlkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_3010" name="Constraint" xmi:id="_qxKXj1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_qxKXkFkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_3011" name="Actor" xmi:id="_qxKXkVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_qxKXklkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012" name="Use Case" xmi:id="_qxKXk1kiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_qxKXlFkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.uml.diagram.usecase.Component_3013" name="Component" xmi:id="_qxKXlVkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_qxKXllkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_3014" name="Package" xmi:id="_qxK-kFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_qxK-kVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2011" name="Actor" xmi:id="_qxK-klkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_qxK-k1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.uml.diagram.usecase.Actor_2012" name="Actor as Classifier" xmi:id="_qxK-lFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.papyrus.uml.diagram.usecase" iconPath="/icons/obj16/Actor_as_Classifier.gif" xmi:id="_qxK-lVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013" name="Use Case" xmi:id="_qxK-llkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_qxK-l1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014" name="Use Case as Classifier" xmi:id="_qxK-mFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.papyrus.uml.diagram.usecase" iconPath="/icons/obj16/UseCase_as_Classifier.gif" xmi:id="_qxK-mVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2015" identifier="org.eclipse.papyrus.uml.diagram.usecase.Classifier_2015" name="Classifier" xmi:id="_qxK-mlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Classifier.gif" xmi:id="_qxK-m1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Classifier</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2016" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_2016" name="Package" xmi:id="_qxK-nFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_qxK-nVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2017" identifier="org.eclipse.papyrus.uml.diagram.usecase.Constraint_2017" name="Constraint" xmi:id="_qxK-nlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_qxK-n1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2018" identifier="org.eclipse.papyrus.uml.diagram.usecase.Comment_2018" name="Comment" xmi:id="_qxK-oFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_qxK-oVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2022" identifier="org.eclipse.papyrus.uml.diagram.usecase.DefaultNamedElement_2022" name="Default Named Element" xmi:id="_qxK-olkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_qxK-o1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.NamedElement</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2019" identifier="org.eclipse.papyrus.uml.diagram.usecase.Diagram_2019" name="Short Cut Diagram" xmi:id="_qxK-pFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.gmfdiag.common.Diagram</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4008" identifier="org.eclipse.papyrus.uml.diagram.usecase.Include_4008" name="Include" xmi:id="_qxK-plkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Include.gif" xmi:id="_qxK-p1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Include</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4009" identifier="org.eclipse.papyrus.uml.diagram.usecase.Extend_4009" name="Extend" xmi:id="_qxK-qFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif" xmi:id="_qxK-qVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Extend</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4010" identifier="org.eclipse.papyrus.uml.diagram.usecase.Generalization_4010" name="Generalization" xmi:id="_qxK-qlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_qxK-q1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.uml.diagram.usecase.Association_4011" name="Association" xmi:id="_qxK-rFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_qxK-rVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013" name="Dependency" xmi:id="_qxK-rlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_qxK-r1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4015" identifier="org.eclipse.papyrus.uml.diagram.usecase.Abstraction_4015" name="Abstraction" xmi:id="_qxK-sFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_qxK-sVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4016" identifier="org.eclipse.papyrus.uml.diagram.usecase.Usage_4016" name="Usage" xmi:id="_qxK-slkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_qxK-s1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Usage</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4017" identifier="org.eclipse.papyrus.uml.diagram.usecase.Realization_4017" name="Realization" xmi:id="_qxK-tFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_qxK-tVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Realization</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4018" identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageMerge_4018" name="Package Merge" xmi:id="_qxK-tlkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_qxK-t1kiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageMerge</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4019" identifier="org.eclipse.papyrus.uml.diagram.usecase.PackageImport_4019" name="Package Import" xmi:id="_qxK-uFkiEeSozs_wDdvj0g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_qxK-uVkiEeSozs_wDdvj0g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageImport</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4014" identifier="org.eclipse.papyrus.uml.diagram.usecase.CommentAnnotatedElement_4014" name="Comment Annotated Element" xmi:id="_HAqeSGqFEeS1S7nMA1LVzg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Comment.AnnotatedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4012" identifier="org.eclipse.papyrus.uml.diagram.usecase.ConstraintConstrainedElement_4012" name="Constraint Constrained Element" xmi:id="_HAqeRWqFEeS1S7nMA1LVzg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint.ConstrainedElements</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UseCase" identifier="org.eclipse.papyrus.uml.diagram.usecase.Package_1000" name="Package" xmi:id="_ewRrIK_rEeSWIf43-VACFg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_ewRrIa_rEeSWIf43-VACFg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
index cf887fb91c7..29fcdc0d363 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/plugin.xml
@@ -974,14 +974,14 @@
       </ParserProvider>
    </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="models/usecaseDiagram.elementtypesconfigurations">
    </elementTypeSet>
 </extension>
 <extension
-      point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+      point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
    <elementTypeSet
    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
          path="models/usecaseDiagram-notation.elementtypesconfigurations">
diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
index d63e57f7730..a1f6cece76e 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.xtext.xbase.lib,

  org.eclipse.xtend.lib,

diff --git a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend
index 172184687df..93f51b6df6c 100644
--- a/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend
+++ b/plugins/uml/newchild/org.eclipse.papyrus.uml.profile.newchildmenu.generator/src/org/eclipse/papyrus/uml/profile/newchildmenu/generator/NewChildMenuGenerator.xtend
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.uml.profile.newchildmenu.generator
 import org.eclipse.emf.common.util.EList

 import org.eclipse.emf.common.util.URI

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration

-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ElementTypeSetConfigurationImpl

+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration

+import org.eclipse.papyrus.infra.types.impl.ElementTypeSetConfigurationImpl

 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu

 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.ElementCreationMenuModelFactory

 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.Folder

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/META-INF/MANIFEST.MF
deleted file mode 100644
index b055de94abe..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,52 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.elementtypesconfigurations.edit;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.uml2.uml.edit;visibility:=reexport,
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.swt,
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.ui.workbench,
- org.eclipse.papyrus.infra.elementtypesconfigurations.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.uml.elementtypesconfigurations,
- org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration,
- org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl,
- org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider,
- org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util,
- org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper,
- org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration,
- org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl,
- org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider,
- org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util,
- org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration,
- org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl,
- org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider,
- org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util,
- org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration,
- org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl,
- org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider,
- org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.uml.elementtypesconfigurations;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel
deleted file mode 100644
index 456cea68a2b..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.genmodel
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="ApplyStereotypeAdviceConfiguration"
-    modelPluginClass="" testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
-  <foreignModel>ApplyStereotypeAdviceConfiguration.ecore</foreignModel>
-  <genPackages prefix="ApplyStereotypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"
-      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"
-      ecorePackage="ApplyStereotypeAdviceConfiguration.ecore#/">
-    <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//ApplyStereotypeAdviceConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdviceConfiguration.ecore#//ApplyStereotypeAdviceConfiguration/stereotypesToApply"/>
-    </genClasses>
-    <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//StereotypeToApply">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdviceConfiguration.ecore#//StereotypeToApply/stereotypeQualifiedName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdviceConfiguration.ecore#//StereotypeToApply/updateName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdviceConfiguration.ecore#//StereotypeToApply/requiredProfiles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdviceConfiguration.ecore#//StereotypeToApply/featuresToSet"/>
-    </genClasses>
-    <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//FeatureToSet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdviceConfiguration.ecore#//FeatureToSet/featureName"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdviceConfiguration.ecore#//FeatureToSet/value"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//FeatureValue"/>
-    <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//ListValue">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ApplyStereotypeAdviceConfiguration.ecore#//ListValue/values"/>
-    </genClasses>
-    <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//ConstantValue">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdviceConfiguration.ecore#//ConstantValue/valueInstance"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//DynamicValue"/>
-    <genClasses ecoreClass="ApplyStereotypeAdviceConfiguration.ecore#//QueryExecutionValue"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel
deleted file mode 100644
index 64bec55104e..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.genmodel
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="InvariantStereotypeRuleConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
-    testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    editPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.genmodel#//invarianttypeconfiguration"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>InvariantStereotypeRuleConfiguration.ecore</foreignModel>
-  <genPackages prefix="InvariantStereotypeRuleConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"
-      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"
-      ecorePackage="InvariantStereotypeRuleConfiguration.ecore#/">
-    <genClasses ecoreClass="InvariantStereotypeRuleConfiguration.ecore#//InvariantStereotypeRuleConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeRuleConfiguration.ecore#//InvariantStereotypeRuleConfiguration/stereotypeQualifiedName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeRuleConfiguration.ecore#//InvariantStereotypeRuleConfiguration/requiredProfile"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel
deleted file mode 100644
index 816a74b53a8..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.genmodel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="StereotypeApplicationMatcherConfiguration"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>StereotypeApplicationMatcherConfiguration.ecore</foreignModel>
-  <genPackages prefix="StereotypeApplicationMatcherConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"
-      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"
-      ecorePackage="StereotypeApplicationMatcherConfiguration.ecore#/">
-    <genClasses ecoreClass="StereotypeApplicationMatcherConfiguration.ecore#//StereotypeApplicationMatcherConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StereotypeApplicationMatcherConfiguration.ecore#//StereotypeApplicationMatcherConfiguration/stereotypesQualifiedNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StereotypeApplicationMatcherConfiguration.ecore#//StereotypeApplicationMatcherConfiguration/profileUri"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.xml
deleted file mode 100644
index 88c1dd47218..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invariantRule">
-      <invariantRule
-            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration"
-            invariantRuleClass="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRule">
-      </invariantRule>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">
-      <adviceConfigurationType
-            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration"
-            factoryClass="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceFactory">
-      </adviceConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.adviceConfigurationType">
-      <adviceConfigurationType
-            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration"
-            factoryClass="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceFactory">
-      </adviceConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.matcherConfigurationType">
-      <matcherConfigurationType
-            configurationClass="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration"
-            factoryClass="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherFactory">
-      </matcherConfigurationType>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated ApplyStereotypeAdviceConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage"
-            genModel="model/ApplyStereotypeAdviceConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated ApplyStereotypeAdviceConfiguration -->
-      <parser
-            type="applystereotypeadviceconfiguration"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated ApplyStereotypeAdviceConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider.ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated ApplyStereotypeAdviceConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider.ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated InvariantStereotypeRuleConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage"
-            genModel="model/InvariantStereotypeRuleConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated InvariantStereotypeRuleConfiguration -->
-      <parser
-            type="invariantstereotyperuleconfiguration"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated InvariantStereotypeRuleConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated InvariantStereotypeRuleConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invarianttype/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory$InvariantTypeConfigurationChildCreationExtender"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated SetTypeAdviceConfiguration -->
-      <package
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage"
-            genModel="model/SetTypeAdviceConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated SetTypeAdviceConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated SetTypeAdviceConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated StereotypeApplicationMatcherConfiguration -->
-      <package
-            uri="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage"
-            genModel="model/StereotypeApplicationMatcherConfiguration.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.extension_parser">
-      <!-- @generated StereotypeApplicationMatcherConfiguration -->
-      <parser
-            type="stereotypeapplicationmatcherconfiguration"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceFactoryImpl"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <!-- @generated StereotypeApplicationMatcherConfiguration -->
-      <factory
-            uri="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.edit.childCreationExtenders">
-      <!-- @generated StereotypeApplicationMatcherConfiguration -->
-      <extender
-            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-            class="org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider.StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory$ElementtypesconfigurationsChildCreationExtender"/>
-   </extension>
-</plugin>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/pom.xml
deleted file mode 100644
index a73773e8a9f..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>org.eclipse.papyrus.uml.elementtypesconfigurations</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java
deleted file mode 100644
index 00db4a23764..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceFactoryImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceImpl
- * @generated
- */
-public class StereotypeApplicationMatcherConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
-	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StereotypeApplicationMatcherConfigurationResourceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Resource createResource(URI uri) {
-		Resource result = new StereotypeApplicationMatcherConfigurationResourceImpl(uri);
-		return result;
-	}
-
-} //StereotypeApplicationMatcherConfigurationResourceFactoryImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
index 003d2af13e0..45a58498b8a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  org.eclipse.uml2.uml.profile.standard,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
  org.eclipse.emf.edit.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
index d4d2919cd0d..10cb930aa7b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
@@ -1,103 +1,29 @@
-<?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"
-    xmi:id="_ScP1oFYCEeS0WsAAtVmToA"
-    name="UML Edit Advices with UI"
-    description="Additional edit advices for UML that implement UI interactions"
-    identifier="org.eclipse.papyrus.uml.service.types.ui.UMLElementTypeUIAdvices"
-    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_R_pDcWT7EeSzFvTXGJPhUg"
-      identifier="org.eclipse.papyrus.uml.ui.advice.ClassifierTemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ClassifierTemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_XzjBAMO1EeWVMJ0KdwVfSA"
-      description=""
-      identifier="org.eclipse.papyrus.uml.ui.advice.CollaborationRole"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.CollaborationCollaborationRoleEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_IsX6UMc9EeS1POoqrCEMrQ"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YO3rEMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.ConnectableElementTemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ConnectableElementTemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_yjhpkJXIEeSmV5hdT3HeBw"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YZtCEMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.Extension"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ExtensionEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScjXoVYCEeS0WsAAtVmToA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YeHoAMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.InformationFlow"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InformationFlowEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ZLpUILgeEeSANYuUIb1qQA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YismAMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.InstanceSpecification.Link"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_bvHrYJXNEeSmV5hdT3HeBw"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YngNgMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.OperationTemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.OperationTemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_vg_QMJXJEeSmV5hdT3HeBw"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_YsKrEMO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.RoleBinding"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.RoleBindingHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_TFofsLhAEeSANYuUIb1qQA"/>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"
-      xmi:id="_Y2rR8MO1EeWVMJ0KdwVfSA"
-      identifier="org.eclipse.papyrus.uml.ui.advice.TemplateParameter"
-      editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.TemplateParameterEditHelperAdvice"
-      inheritance="all">
-    <target
-        xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-        href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA"/>
-  </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Additional edit advices for UML that implement UI interactions" identifier="org.eclipse.papyrus.uml.service.types.ui.UMLElementTypeUIAdvices" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UML Edit Advices with UI" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ClassifierTemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.ClassifierTemplateParameter" inheritance="all" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.CollaborationCollaborationRoleEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.CollaborationRole" inheritance="all" xmi:id="_XzjBAMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_IsX6UMc9EeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ConnectableElementTemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.ConnectableElementTemplateParameter" inheritance="all" xmi:id="_YO3rEMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_yjhpkJXIEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ExtensionEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.Extension" inheritance="all" xmi:id="_YZtCEMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScjXoVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InformationFlowEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.InformationFlow" inheritance="all" xmi:id="_YeHoAMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ZLpUILgeEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.InstanceSpecification.Link" inheritance="all" xmi:id="_YismAMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_bvHrYJXNEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.OperationTemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.OperationTemplateParameter" inheritance="all" xmi:id="_YngNgMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_vg_QMJXJEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.RoleBindingHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.RoleBinding" inheritance="all" xmi:id="_YsKrEMO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_TFofsLhAEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.TemplateParameterEditHelperAdvice" identifier="org.eclipse.papyrus.uml.ui.advice.TemplateParameter" inheritance="all" xmi:id="_Y2rR8MO1EeWVMJ0KdwVfSA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <target href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_kyfxEH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
index bda89345dc7..00436a38341 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/plugin.xml
@@ -1591,7 +1591,7 @@
 			</image>
  </extension>
  <extension
-       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
     <elementTypeSet
           clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/uml-advice.elementtypesconfigurations">
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index b177d38a85f..2faf54879de 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -23,12 +23,12 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
  org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
  org.eclipse.uml2.uml.profile.standard,
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.emf.ecore;bundle-version="2.11.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"
+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
index 314a3bbbadd..25feda158db 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.service.types.StandardProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" name="StandardProfile" xmi:id="_jfoLkGT_EeSEqNuV3JpFCA" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="UML::Stereotype::Trace" identifier="org.eclipse.papyrus.uml.stereotype.Trace" name="UML::Stereotype::Trace" xmi:id="_Wv4tEGUAEeSEqNuV3JpFCA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="UML::Stereotype::Refine" identifier="org.eclipse.papyrus.uml.stereotype.Refine" name="UML::Stereotype::Refine" xmi:id="_Wv4tEWUAEeSEqNuV3JpFCA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <eClass href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine"/>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.service.types.StandardProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" name="StandardProfile" xmi:id="_jfoLkGT_EeSEqNuV3JpFCA" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="UML::Stereotype::Trace" identifier="org.eclipse.papyrus.uml.stereotype.Trace" name="UML::Stereotype::Trace" xmi:id="_Wv4tEGUAEeSEqNuV3JpFCA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper" hint="UML::Stereotype::Refine" identifier="org.eclipse.papyrus.uml.stereotype.Refine" name="UML::Stereotype::Refine" xmi:id="_Wv4tEWUAEeSEqNuV3JpFCA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <eClass href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine"/>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
index 7fcf23dd8ac..4b7c021afb6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
@@ -1,338 +1,338 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.service.types.UMLContainmentsElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLContainmentsElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
-  <elementTypeConfigurations hint="UML::UseCase_As_UML::Classifier::ownedUseCase" identifier="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" name="UML::UseCase_As_UML::Classifier::ownedUseCase" xmi:id="_SdLC0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_SdLpwFYCEeS0WsAAtVmToA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UseCaseAsClassifierOwnedUseCaseEditHelperAdvice" xmi:id="_g1eR0FuQEeSq2af_QYA1OA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <containerConfiguration xmi:id="_SdLpwVYCEeS0WsAAtVmToA">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement" name="Constraint_As_UML::Package::packagedElement" xmi:id="_OdntAJgmEeSbPLBxcMMcNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_m1srIJgmEeSbPLBxcMMcNg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-    <containerConfiguration xmi:id="_tgfvMJgmEeSbPLBxcMMcNg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::StringExpression_As_UML::Package::packagedElement" identifier="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement" name="UML::StringExpression_As_UML::Package::packagedElement" xmi:id="_y2EkwL0dEeSA8oxr--Q4Aw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif" xmi:id="_y2FL0L0dEeSA8oxr--Q4Aw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.StringExpression</specializedTypesID>
-    <containerConfiguration xmi:id="_y2FL0r0dEeSA8oxr--Q4Aw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="ExpansionNode_As_UML::ExpansionRegion::inputElement" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" name="Expansion Node" xmi:id="_EcQ3QLocEeSsV_IrhqhBPw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_Si-6ULocEeSsV_IrhqhBPw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>
-    <containerConfiguration xmi:id="_xpxzMLocEeSsV_IrhqhBPw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/inputElement"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="ExpansionNode_As_UML::ExpansionRegion::outputElement" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" name="Expansion Node" xmi:id="_4YwzsLocEeSsV_IrhqhBPw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_4YwzsbocEeSsV_IrhqhBPw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>
-    <containerConfiguration xmi:id="_4YwzsrocEeSsV_IrhqhBPw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/outputElement"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Constraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition" name="Constraint_As_Pre" xmi:id="_9_NrAL6fEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_4JcVAL6gEeSWor5pKcy9Fw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-    <containerConfiguration xmi:id="_9i00gL6gEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Constraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition" name="Constraint_As_Post" xmi:id="_1fLHIL6gEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_7d_O8L6gEeSWor5pKcy9Fw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>
-    <containerConfiguration xmi:id="_F9kzQL6hEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DurationConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition" name="DurationConstraint_As_Pre" xmi:id="_cBmEEL6hEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_cBmEEb6hEeSWor5pKcy9Fw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>
-    <containerConfiguration xmi:id="_cBmEEr6hEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::DurationConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition" name="DurationConstraint_As_Post" xmi:id="_cBmEE76hEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_51aSIL6hEeSWor5pKcy9Fw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>
-    <containerConfiguration xmi:id="_cBmEFb6hEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TimeConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition" name="TimeConstraint_As_Pre" xmi:id="_wT89ML9VEeSdDOiyPlc_Pg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_wT89Mb9VEeSdDOiyPlc_Pg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>
-    <containerConfiguration xmi:id="_wT89Mr9VEeSdDOiyPlc_Pg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TimeConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition" name="TimeConstraint_As_Post" xmi:id="_wT89M79VEeSdDOiyPlc_Pg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_wT89NL9VEeSdDOiyPlc_Pg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>
-    <containerConfiguration xmi:id="_wT89Nb9VEeSdDOiyPlc_Pg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::IntervalConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition" name="IntervalConstraint_As_Pre" xmi:id="_iJLVAL9fEeSNNsF8trqP9g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_iJLVAb9fEeSNNsF8trqP9g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>
-    <containerConfiguration xmi:id="_iJLVAr9fEeSNNsF8trqP9g">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::IntervalConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition" name="IntervalConstraint_As_Post" xmi:id="_iJLVA79fEeSNNsF8trqP9g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_iJLVBL9fEeSNNsF8trqP9g"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>
-    <containerConfiguration xmi:id="_iJLVBb9fEeSNNsF8trqP9g">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" identifier="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" name="org.eclipse.papyrus.uml.Component_As_UML" xmi:id="_haR0kNCrEeSPA6G9EAuxLg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
-    <containerConfiguration xmi:id="_yePr4NCrEeSPA6G9EAuxLg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Component/packagedElement"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior_As_UML::State::doActivity" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity" name="UML::Behavior_As_UML::State::doActivity" xmi:id="_rw_ToMwfEeSDe-jctQxSwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_5YbZsMwfEeSDe-jctQxSwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <containerConfiguration xmi:id="_KoAEEMwgEeSDe-jctQxSwg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/doActivity"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations description="" hint="UML::Behavior_As_UML::State::entry" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::entry" name="UML::Behavior_As_UML::State::entry" xmi:id="_7S3GEMwfEeSDe-jctQxSwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_7S3GEcwfEeSDe-jctQxSwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <containerConfiguration xmi:id="_QapYIMwgEeSDe-jctQxSwg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/entry"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Behavior_As_UML::State::exit" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::exit" name="UML::Behavior_As_UML::State::exit" xmi:id="_7eFeoMwfEeSDe-jctQxSwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_7eFeocwfEeSDe-jctQxSwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>
-    <containerConfiguration xmi:id="_Q3yAEMwgEeSDe-jctQxSwg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/exit"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target" name="InputPin_As_CallOperationActionTarget" xmi:id="_cFHhsNRkEeS91tsV_VS13w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_SFG_4NRlEeS91tsV_VS13w"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_40hagNRmEeSVOv5wRpe-fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target" name="ActionInputPin_As_CallOperationActionTarget" xmi:id="_FlO-0NRlEeS91tsV_VS13w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_Sdx-kNRlEeS91tsV_VS13w"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_Ev5AUNRnEeSVOv5wRpe-fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target" name="ValuePin_As_CallOperationActionTarget" xmi:id="_v7964NRlEeS91tsV_VS13w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_v7964dRlEeS91tsV_VS13w"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_E4Xm4NRnEeSVOv5wRpe-fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object" name="InputPin_As_Object_In_SendObjectAction" xmi:id="_U92jENRvEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_U92jEdRvEeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_U92jEtRvEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object" name="ActionInputPin_As_Object_In_SendObjectAction" xmi:id="_U92jE9RvEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_U92jFNRvEeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_9SkuoNRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object" name="ValuePin_As_Object_In_SendObjectAction" xmi:id="_U92jFtRvEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_U92jF9RvEeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_9dAdANRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request" name="InputPin_As_Request_In_SendObjectAction" xmi:id="_GS58INRwEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_GS58IdRwEeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_GS58ItRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request" name="ActionInputPin_As_Request_In_SendObjectAction" xmi:id="_GS58I9RwEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_GS58JNRwEeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_GS58JdRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request" name="ValuePin_As_Request_In_SendObjectAction" xmi:id="_GS58JtRwEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_GS58J9RwEeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_GS58KNRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target" name="InputPin_As_Target_In_SendSignalAction" xmi:id="_wAaYMNR0EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_wAaYMdR0EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_wAaYMtR0EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target" name="ActionInputPin_As_Target_In_SendSignalAction" xmi:id="_wAaYM9R0EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_wAaYNNR0EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_wAaYNdR0EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target" name="ValuePin_As_Target_In_SendSignalAction" xmi:id="_wAaYNtR0EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_wAaYN9R0EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_wAaYONR0EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OutputPin_As_UML::LoopNode::loopNodeVariable" identifier="org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable" name="OutputPin_As_LoopNodeVariable_In_LoopNode" xmi:id="_GVKk8NR7EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_GVKk8dR7EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_GVKk8tR7EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode/loopVariable"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="InputPin_As_InsertAt_In_AddStructuralFeatureValueAction" xmi:id="_UATp0NR8EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_UATp0dR8EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_9IsjcNR8EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddStructuralFeatureValueAction" xmi:id="_UATp09R8EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_UATp1NR8EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_VF8mwNR9EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddStructuralFeatureValueAction" xmi:id="_UATp1tR8EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_UATp19R8EeS2r-Rad2ICiQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_VXqo4NR9EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value" name="InputPin_As_Value_In_AddStructuralFeatureValueAction" xmi:id="_CEKbENSBEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_CEKbEdSBEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_CEKbEtSBEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" name="ActionInputPin_As_Value_In_AddStructuralFeatureValueAction" xmi:id="_CEKbE9SBEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_CEKbFNSBEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_CEKbFdSBEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value" name="ValuePin_As_Value_In_AddStructuralFeatureValueAction" xmi:id="_CEKbFtSBEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_CEKbF9SBEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_CEKbGNSBEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt" name="InputPin_As_InsertAt_In_AddVariableValueAction" xmi:id="_NIgAUNSDEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_NIgAUdSDEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_NIgAUtSDEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddVariableValueAction" xmi:id="_NIgAU9SDEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_NIgAVNSDEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_NIgAVdSDEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddVariableValueAction" xmi:id="_NIgAVtSDEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_NIgAV9SDEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_NIgAWNSDEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object" name="InputPin_As_Object_In_StartObjectBehaviorAction" xmi:id="_78em8NSHEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_78em8dSHEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_78em8tSHEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object" name="ActionInputPin_As_Object_In_StartObjectBehaviorAction" xmi:id="_78em89SHEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_78em9NSHEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_78em9dSHEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object" name="ValuePin_As_Object_In_StartObjectBehaviorAction" xmi:id="_78em9tSHEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_78em99SHEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_78em-NSHEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second" name="InputPin_As_Second_In_TestIdentityAction" xmi:id="_qGX2INSJEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_qGX2IdSJEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_qGX2ItSJEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second" name="ActionInputPin_As_Second_In_TestIdentityAction" xmi:id="_qGX2I9SJEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_qGX2JNSJEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>
-    <containerConfiguration xmi:id="_qGX2JdSJEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ValuePin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second" name="ValuePin_As_Second_In_TestIdentityAction" xmi:id="_qGX2JtSJEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_qGX2J9SJEeSxgPgY51xQ1A"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>
-    <containerConfiguration xmi:id="_qGX2KNSJEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ExecutionEnvironment_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode" name="ExecutionEnvironment_As_NestedNode_In_Node" xmi:id="_5TRgkP_rEeSVDoeWScjgfg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" xmi:id="_8CDbAP_rEeSVDoeWScjgfg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>
-    <containerConfiguration xmi:id="_875NEP_rEeSVDoeWScjgfg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Device_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode" name="Device_As_NestedNode_In_Node" xmi:id="_1dxZMP_sEeSVDoeWScjgfg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" xmi:id="_2pe-YP_sEeSVDoeWScjgfg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>
-    <containerConfiguration xmi:id="_2pe-Yf_sEeSVDoeWScjgfg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Node_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode" name="Node_As_NestedNode_In_Node" xmi:id="_11G7IP_sEeSVDoeWScjgfg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" xmi:id="_26IpgP_sEeSVDoeWScjgfg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>
-    <containerConfiguration xmi:id="_26Ipgf_sEeSVDoeWScjgfg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
-    </containerConfiguration>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.service.types.UMLContainmentsElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLContainmentsElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations hint="UML::UseCase_As_UML::Classifier::ownedUseCase" identifier="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" name="UML::UseCase_As_UML::Classifier::ownedUseCase" xmi:id="_SdLC0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_SdLpwFYCEeS0WsAAtVmToA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UseCaseAsClassifierOwnedUseCaseEditHelperAdvice" xmi:id="_g1eR0FuQEeSq2af_QYA1OA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <containerConfiguration xmi:id="_SdLpwVYCEeS0WsAAtVmToA">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement" name="Constraint_As_UML::Package::packagedElement" xmi:id="_OdntAJgmEeSbPLBxcMMcNg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_m1srIJgmEeSbPLBxcMMcNg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+    <containerConfiguration xmi:id="_tgfvMJgmEeSbPLBxcMMcNg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::StringExpression_As_UML::Package::packagedElement" identifier="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement" name="UML::StringExpression_As_UML::Package::packagedElement" xmi:id="_y2EkwL0dEeSA8oxr--Q4Aw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif" xmi:id="_y2FL0L0dEeSA8oxr--Q4Aw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.StringExpression</specializedTypesID>

+    <containerConfiguration xmi:id="_y2FL0r0dEeSA8oxr--Q4Aw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="ExpansionNode_As_UML::ExpansionRegion::inputElement" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" name="Expansion Node" xmi:id="_EcQ3QLocEeSsV_IrhqhBPw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_Si-6ULocEeSsV_IrhqhBPw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>

+    <containerConfiguration xmi:id="_xpxzMLocEeSsV_IrhqhBPw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/inputElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="ExpansionNode_As_UML::ExpansionRegion::outputElement" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" name="Expansion Node" xmi:id="_4YwzsLocEeSsV_IrhqhBPw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_4YwzsbocEeSsV_IrhqhBPw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExpansionNode</specializedTypesID>

+    <containerConfiguration xmi:id="_4YwzsrocEeSsV_IrhqhBPw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/outputElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Constraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition" name="Constraint_As_Pre" xmi:id="_9_NrAL6fEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_4JcVAL6gEeSWor5pKcy9Fw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+    <containerConfiguration xmi:id="_9i00gL6gEeSWor5pKcy9Fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Constraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition" name="Constraint_As_Post" xmi:id="_1fLHIL6gEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_7d_O8L6gEeSWor5pKcy9Fw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Constraint</specializedTypesID>

+    <containerConfiguration xmi:id="_F9kzQL6hEeSWor5pKcy9Fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DurationConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition" name="DurationConstraint_As_Pre" xmi:id="_cBmEEL6hEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_cBmEEb6hEeSWor5pKcy9Fw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>

+    <containerConfiguration xmi:id="_cBmEEr6hEeSWor5pKcy9Fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::DurationConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition" name="DurationConstraint_As_Post" xmi:id="_cBmEE76hEeSWor5pKcy9Fw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_51aSIL6hEeSWor5pKcy9Fw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.DurationConstraint</specializedTypesID>

+    <containerConfiguration xmi:id="_cBmEFb6hEeSWor5pKcy9Fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TimeConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition" name="TimeConstraint_As_Pre" xmi:id="_wT89ML9VEeSdDOiyPlc_Pg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_wT89Mb9VEeSdDOiyPlc_Pg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>

+    <containerConfiguration xmi:id="_wT89Mr9VEeSdDOiyPlc_Pg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TimeConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition" name="TimeConstraint_As_Post" xmi:id="_wT89M79VEeSdDOiyPlc_Pg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_wT89NL9VEeSdDOiyPlc_Pg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.TimeConstraint</specializedTypesID>

+    <containerConfiguration xmi:id="_wT89Nb9VEeSdDOiyPlc_Pg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::IntervalConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition" name="IntervalConstraint_As_Pre" xmi:id="_iJLVAL9fEeSNNsF8trqP9g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_iJLVAb9fEeSNNsF8trqP9g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>

+    <containerConfiguration xmi:id="_iJLVAr9fEeSNNsF8trqP9g">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::IntervalConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition" name="IntervalConstraint_As_Post" xmi:id="_iJLVA79fEeSNNsF8trqP9g" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_iJLVBL9fEeSNNsF8trqP9g"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.IntervalConstraint</specializedTypesID>

+    <containerConfiguration xmi:id="_iJLVBb9fEeSNNsF8trqP9g">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" identifier="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" name="org.eclipse.papyrus.uml.Component_As_UML" xmi:id="_haR0kNCrEeSPA6G9EAuxLg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+    <containerConfiguration xmi:id="_yePr4NCrEeSPA6G9EAuxLg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Component/packagedElement"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior_As_UML::State::doActivity" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity" name="UML::Behavior_As_UML::State::doActivity" xmi:id="_rw_ToMwfEeSDe-jctQxSwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_5YbZsMwfEeSDe-jctQxSwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <containerConfiguration xmi:id="_KoAEEMwgEeSDe-jctQxSwg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/doActivity"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="" hint="UML::Behavior_As_UML::State::entry" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::entry" name="UML::Behavior_As_UML::State::entry" xmi:id="_7S3GEMwfEeSDe-jctQxSwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_7S3GEcwfEeSDe-jctQxSwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <containerConfiguration xmi:id="_QapYIMwgEeSDe-jctQxSwg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/entry"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Behavior_As_UML::State::exit" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::exit" name="UML::Behavior_As_UML::State::exit" xmi:id="_7eFeoMwfEeSDe-jctQxSwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_7eFeocwfEeSDe-jctQxSwg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Behavior</specializedTypesID>

+    <containerConfiguration xmi:id="_Q3yAEMwgEeSDe-jctQxSwg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/exit"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target" name="InputPin_As_CallOperationActionTarget" xmi:id="_cFHhsNRkEeS91tsV_VS13w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_SFG_4NRlEeS91tsV_VS13w"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_40hagNRmEeSVOv5wRpe-fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target" name="ActionInputPin_As_CallOperationActionTarget" xmi:id="_FlO-0NRlEeS91tsV_VS13w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_Sdx-kNRlEeS91tsV_VS13w"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_Ev5AUNRnEeSVOv5wRpe-fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target" name="ValuePin_As_CallOperationActionTarget" xmi:id="_v7964NRlEeS91tsV_VS13w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_v7964dRlEeS91tsV_VS13w"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_E4Xm4NRnEeSVOv5wRpe-fw">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object" name="InputPin_As_Object_In_SendObjectAction" xmi:id="_U92jENRvEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_U92jEdRvEeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_U92jEtRvEeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object" name="ActionInputPin_As_Object_In_SendObjectAction" xmi:id="_U92jE9RvEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_U92jFNRvEeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_9SkuoNRwEeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object" name="ValuePin_As_Object_In_SendObjectAction" xmi:id="_U92jFtRvEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_U92jF9RvEeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_9dAdANRwEeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request" name="InputPin_As_Request_In_SendObjectAction" xmi:id="_GS58INRwEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_GS58IdRwEeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_GS58ItRwEeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request" name="ActionInputPin_As_Request_In_SendObjectAction" xmi:id="_GS58I9RwEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_GS58JNRwEeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_GS58JdRwEeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request" name="ValuePin_As_Request_In_SendObjectAction" xmi:id="_GS58JtRwEeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_GS58J9RwEeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_GS58KNRwEeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target" name="InputPin_As_Target_In_SendSignalAction" xmi:id="_wAaYMNR0EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_wAaYMdR0EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_wAaYMtR0EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target" name="ActionInputPin_As_Target_In_SendSignalAction" xmi:id="_wAaYM9R0EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_wAaYNNR0EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_wAaYNdR0EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target" name="ValuePin_As_Target_In_SendSignalAction" xmi:id="_wAaYNtR0EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_wAaYN9R0EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_wAaYONR0EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OutputPin_As_UML::LoopNode::loopNodeVariable" identifier="org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable" name="OutputPin_As_LoopNodeVariable_In_LoopNode" xmi:id="_GVKk8NR7EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_GVKk8dR7EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.OutputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_GVKk8tR7EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode/loopVariable"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="InputPin_As_InsertAt_In_AddStructuralFeatureValueAction" xmi:id="_UATp0NR8EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_UATp0dR8EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_9IsjcNR8EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddStructuralFeatureValueAction" xmi:id="_UATp09R8EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_UATp1NR8EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_VF8mwNR9EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddStructuralFeatureValueAction" xmi:id="_UATp1tR8EeS2r-Rad2ICiQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_UATp19R8EeS2r-Rad2ICiQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_VXqo4NR9EeS2r-Rad2ICiQ">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value" name="InputPin_As_Value_In_AddStructuralFeatureValueAction" xmi:id="_CEKbENSBEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_CEKbEdSBEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_CEKbEtSBEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" name="ActionInputPin_As_Value_In_AddStructuralFeatureValueAction" xmi:id="_CEKbE9SBEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_CEKbFNSBEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_CEKbFdSBEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value" name="ValuePin_As_Value_In_AddStructuralFeatureValueAction" xmi:id="_CEKbFtSBEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_CEKbF9SBEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_CEKbGNSBEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt" name="InputPin_As_InsertAt_In_AddVariableValueAction" xmi:id="_NIgAUNSDEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_NIgAUdSDEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_NIgAUtSDEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddVariableValueAction" xmi:id="_NIgAU9SDEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_NIgAVNSDEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_NIgAVdSDEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddVariableValueAction" xmi:id="_NIgAVtSDEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_NIgAV9SDEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_NIgAWNSDEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object" name="InputPin_As_Object_In_StartObjectBehaviorAction" xmi:id="_78em8NSHEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_78em8dSHEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_78em8tSHEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object" name="ActionInputPin_As_Object_In_StartObjectBehaviorAction" xmi:id="_78em89SHEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_78em9NSHEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_78em9dSHEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object" name="ValuePin_As_Object_In_StartObjectBehaviorAction" xmi:id="_78em9tSHEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_78em99SHEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_78em-NSHEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second" name="InputPin_As_Second_In_TestIdentityAction" xmi:id="_qGX2INSJEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_qGX2IdSJEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_qGX2ItSJEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ActionInputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second" name="ActionInputPin_As_Second_In_TestIdentityAction" xmi:id="_qGX2I9SJEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_qGX2JNSJEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ActionInputPin</specializedTypesID>

+    <containerConfiguration xmi:id="_qGX2JdSJEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ValuePin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second" name="ValuePin_As_Second_In_TestIdentityAction" xmi:id="_qGX2JtSJEeSxgPgY51xQ1A" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_qGX2J9SJEeSxgPgY51xQ1A"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ValuePin</specializedTypesID>

+    <containerConfiguration xmi:id="_qGX2KNSJEeSxgPgY51xQ1A">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ExecutionEnvironment_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode" name="ExecutionEnvironment_As_NestedNode_In_Node" xmi:id="_5TRgkP_rEeSVDoeWScjgfg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" xmi:id="_8CDbAP_rEeSVDoeWScjgfg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExecutionEnvironment</specializedTypesID>

+    <containerConfiguration xmi:id="_875NEP_rEeSVDoeWScjgfg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Device_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode" name="Device_As_NestedNode_In_Node" xmi:id="_1dxZMP_sEeSVDoeWScjgfg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" xmi:id="_2pe-YP_sEeSVDoeWScjgfg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Device</specializedTypesID>

+    <containerConfiguration xmi:id="_2pe-Yf_sEeSVDoeWScjgfg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Node_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode" name="Node_As_NestedNode_In_Node" xmi:id="_11G7IP_sEeSVDoeWScjgfg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" xmi:id="_26IpgP_sEeSVDoeWScjgfg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Node</specializedTypesID>

+    <containerConfiguration xmi:id="_26Ipgf_sEeSVDoeWScjgfg">

+      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>

+    </containerConfiguration>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
index bf91902e2e3..6714208dfcb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
@@ -1,1101 +1,1101 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.service.types.UMLElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Abstraction" identifier="org.eclipse.papyrus.uml.Abstraction" name="UML::Abstraction" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_ScP1olYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Abstraction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AcceptCallAction" identifier="org.eclipse.papyrus.uml.AcceptCallAction" name="UML::AcceptCallAction" xmi:id="_ScQcs1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptCallAction.gif" xmi:id="_ScQctFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptCallAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.uml.AcceptEventAction" name="UML::AcceptEventAction" xmi:id="_ScQcu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ScQcvFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptEventAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::Action" identifier="org.eclipse.papyrus.uml.Action" name="UML::Action" xmi:id="_ScRDxFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ScRDxVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Action"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ActionExecutionSpecification" identifier="org.eclipse.papyrus.uml.ActionExecutionSpecification" name="UML::ActionExecutionSpecification" xmi:id="_ScRDxlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" xmi:id="_ScRDx1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActionInputPin" identifier="org.eclipse.papyrus.uml.ActionInputPin" name="UML::ActionInputPin" xmi:id="_ScRDyFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_ScRDyVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionInputPin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityHelper" hint="UML::Activity" identifier="org.eclipse.papyrus.uml.Activity" name="UML::Activity" xmi:id="_ScTgG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_ScTgHFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ActivityContent" identifier="org.eclipse.papyrus.uml.ActivityContent" name="UML::ActivityContent" xmi:id="_ScTgHVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityContent.gif" xmi:id="_ScTgHlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityContent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ActivityEdge" identifier="org.eclipse.papyrus.uml.ActivityEdge" name="UML::ActivityEdge" xmi:id="_ScTgH1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityEdge.gif" xmi:id="_ScTgIFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityEdge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActivityFinalNode" identifier="org.eclipse.papyrus.uml.ActivityFinalNode" name="UML::ActivityFinalNode" xmi:id="_ScTgIVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif" xmi:id="_ScTgIlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityFinalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityGroupHelper" hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.uml.ActivityGroup" name="UML::ActivityGroup" xmi:id="_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ScTgJFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityGroup"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActivityNode" identifier="org.eclipse.papyrus.uml.ActivityNode" name="UML::ActivityNode" xmi:id="_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ScTgJlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActivityParameterNode" identifier="org.eclipse.papyrus.uml.ActivityParameterNode" name="UML::ActivityParameterNode" xmi:id="_ScTgJ1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_ScTgKFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityPartitionEditHelper" hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.uml.ActivityPartition" name="UML::ActivityPartition" xmi:id="_ScTgKVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ScTgKlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityPartition"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Actor" identifier="org.eclipse.papyrus.uml.Actor" name="UML::Actor" xmi:id="_ScV8UVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_ScV8UlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Actor"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AddStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" name="UML::AddStructuralFeatureValueAction" xmi:id="_ScWjU1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" xmi:id="_ScWjVFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AddVariableValueAction" identifier="org.eclipse.papyrus.uml.AddVariableValueAction" name="UML::AddVariableValueAction" xmi:id="_ScWjW1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddVariableValueAction.gif" xmi:id="_ScWjXFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::AnyReceiveEvent" identifier="org.eclipse.papyrus.uml.AnyReceiveEvent" name="UML::AnyReceiveEvent" xmi:id="_ScXKYFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" xmi:id="_ScXKYVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AnyReceiveEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Artifact" identifier="org.eclipse.papyrus.uml.Artifact" name="UML::Artifact" xmi:id="_ScXKaFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_ScXKaVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper" hint="UML::AssociationBase" identifier="org.eclipse.papyrus.uml.AssociationBase" name="UML::AssociationBase" xmi:id="_ScXxdFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_ScXxdVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Association"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Association" identifier="org.eclipse.papyrus.uml.Association" name="UML::Association" xmi:id="_f8dpoFYTEeSx49G4xBUj9Q" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_vYYlEFYTEeSx49G4xBUj9Q"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AssociationBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice" xmi:id="_4Jz-cFYTEeSx49G4xBUj9Q" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher" xmi:id="_-lvgEFYTEeSx49G4xBUj9Q" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper" hint="UML::AssociationClassBase" identifier="org.eclipse.papyrus.uml.AssociationClassBase" name="UML::AssociationClassBase" xmi:id="_ScXxdlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_ScXxd1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AssociationClass"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::AssociationClass" identifier="org.eclipse.papyrus.uml.AssociationClass" name="UML::AssociationClass" xmi:id="_2JgRAHV3EeScr8rbRObDkA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_2Jg4EHV3EeScr8rbRObDkA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.AssociationClassBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice" xmi:id="_2Jg4EXV3EeScr8rbRObDkA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Behavior" identifier="org.eclipse.papyrus.uml.Behavior" name="UML::Behavior" xmi:id="_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ScaNsVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::BehaviorExecutionSpecification" identifier="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" name="UML::BehaviorExecutionSpecification" xmi:id="_ScaNslYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" xmi:id="_ScaNs1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::BehavioralFeature" identifier="org.eclipse.papyrus.uml.BehavioralFeature" name="UML::BehavioralFeature" xmi:id="_ScaNtFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehavioralFeature.gif" xmi:id="_ScaNtVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.BehavioredClassifierEditHelper" hint="UML::BehavioredClassifier" identifier="org.eclipse.papyrus.uml.BehavioredClassifier" name="UML::BehavioredClassifier" xmi:id="_ScaNtlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehavioredClassifier.gif" xmi:id="_ScaNt1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::BroadcastSignalAction" identifier="org.eclipse.papyrus.uml.BroadcastSignalAction" name="UML::BroadcastSignalAction" xmi:id="_ScaNuFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" xmi:id="_ScaNuVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BroadcastSignalAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CallAction" identifier="org.eclipse.papyrus.uml.CallAction" name="UML::CallAction" xmi:id="_ScaNwFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallAction.gif" xmi:id="_ScaNwVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CallBehaviorAction" identifier="org.eclipse.papyrus.uml.CallBehaviorAction" name="UML::CallBehaviorAction" xmi:id="_ScaNwlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_ScaNw1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallBehaviorAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::CallEvent" identifier="org.eclipse.papyrus.uml.CallEvent" name="UML::CallEvent" xmi:id="_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ScaNy1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.uml.CallOperationAction" name="UML::CallOperationAction" xmi:id="_ScaN0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ScaN01YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CentralBufferNode" identifier="org.eclipse.papyrus.uml.CentralBufferNode" name="UML::CentralBufferNode" xmi:id="_ScaN2lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CentralBufferNode.gif" xmi:id="_ScaN21YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CentralBufferNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.uml.ChangeEvent" name="UML::ChangeEvent" xmi:id="_ScaN3FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ScaN3VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ChangeEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ClassEditHelper" hint="UML::Class" identifier="org.eclipse.papyrus.uml.Class" name="UML::Class" xmi:id="_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_Sca0wlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Classifier" identifier="org.eclipse.papyrus.uml.Classifier" name="UML::Classifier" xmi:id="_Sca0z1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Classifier.gif" xmi:id="_Sca00FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ClassifierTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase" name="UML::ClassifierTemplateParameterBase" xmi:id="_Sca00VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" xmi:id="_Sca00lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClassifierTemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ClassifierTemplateParameter" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameter" name="UML::ClassifierTemplateParameter" xmi:id="_kyfxEH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.ClassifierTemplateParameterBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierTemplateParameterEditHelperAdvice" xmi:id="_uuHFoH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Clause" identifier="org.eclipse.papyrus.uml.Clause" name="UML::Clause" xmi:id="_Sca001YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Clause.gif" xmi:id="_Sca01FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Clause"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ClearAssociationAction" identifier="org.eclipse.papyrus.uml.ClearAssociationAction" name="UML::ClearAssociationAction" xmi:id="_Sca01VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearAssociationAction.gif" xmi:id="_Sca01lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearAssociationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ClearStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" name="UML::ClearStructuralFeatureAction" xmi:id="_Sca03VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" xmi:id="_Sca03lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearStructuralFeatureAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ClearVariableAction" identifier="org.eclipse.papyrus.uml.ClearVariableAction" name="UML::ClearVariableAction" xmi:id="_Sca05VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearVariableAction.gif" xmi:id="_Sca05lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearVariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CollaborationEditHelper" hint="UML::Collaboration" identifier="org.eclipse.papyrus.uml.Collaboration" name="UML::Collaboration" xmi:id="_Sca07VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_Sca07lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Collaboration::CollaborationRole" identifier="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" name="UML::Collaboration::CollaborationRole" xmi:id="_IsX6UMc9EeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElement.gif" xmi:id="_XvNAUMc9EeS1POoqrCEMrQ"/>
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationCollaborationRoleEditHelperAdvice" xmi:id="_8m8kIMc9EeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::CollaborationUse" identifier="org.eclipse.papyrus.uml.CollaborationUse" name="UML::CollaborationUse" xmi:id="_Sca071YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CollaborationUse.gif" xmi:id="_Sca08FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CollaborationUse"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::CombinedFragment" identifier="org.eclipse.papyrus.uml.CombinedFragment" name="UML::CombinedFragment" xmi:id="_Scbb1lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CombinedFragment.gif" xmi:id="_Scbb11YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Comment" identifier="org.eclipse.papyrus.uml.Comment" name="UML::Comment" xmi:id="_Scbb2FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_Scbb2VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Comment::AnnotatedElements" identifier="org.eclipse.papyrus.uml.Comment.AnnotatedElements" name="UML::Comment::AnnotatedElements" xmi:id="_poCSAGqWEeSE-IVtP6jQeA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsEditHelperAdvice" xmi:id="_6-K50HY7EeSaAZaF2vKiqg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CommunicationPathEditHelper" hint="UML::CommunicationPath" identifier="org.eclipse.papyrus.uml.CommunicationPath" name="UML::CommunicationPath" xmi:id="_Scbb2lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CommunicationPath.gif" xmi:id="_Scbb21YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CommunicationPath"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentEditHelper" hint="UML::Component" identifier="org.eclipse.papyrus.uml.Component" name="UML::Component" xmi:id="_Scbb6FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_Scbb6VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentRealizationEditHelper" hint="UML::ComponentRealization" identifier="org.eclipse.papyrus.uml.ComponentRealization" name="UML::ComponentRealization" xmi:id="_Scbb6lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif" xmi:id="_Scbb61YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ComponentRealization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper" hint="UML::ConditionalNode" identifier="org.eclipse.papyrus.uml.ConditionalNode" name="UML::ConditionalNode" xmi:id="_ScbcBFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif" xmi:id="_ScbcBVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConditionalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectableElement" identifier="org.eclipse.papyrus.uml.ConnectableElement" name="UML::ConnectableElement" xmi:id="_SccC71YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElement.gif" xmi:id="_SccC8FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectableElementTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase" name="UML::ConnectableElementTemplateParameterBase" xmi:id="_SccC8VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" xmi:id="_SccC8lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElementTemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ConnectableElementTemplateParameter" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" name="UML::ConnectableElementTemplateParameter" xmi:id="_yjhpkJXIEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectableElementTemplateParameterEditHelperAdvice" xmi:id="_yjhpkZXIEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectionPointReference" identifier="org.eclipse.papyrus.uml.ConnectionPointReference" name="UML::ConnectionPointReference" xmi:id="_SccC81YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif" xmi:id="_SccC9FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectionPointReference"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConnectorEditHelper" hint="UML::Connector" identifier="org.eclipse.papyrus.uml.Connector" name="UML::Connector" xmi:id="_SccC9VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_SccC9lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectorEnd" identifier="org.eclipse.papyrus.uml.ConnectorEnd" name="UML::ConnectorEnd" xmi:id="_SccC91YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectorEnd.gif" xmi:id="_SccC-FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectorEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConsiderIgnoreFragment" identifier="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" name="UML::ConsiderIgnoreFragment" xmi:id="_SccC-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" xmi:id="_SccC-lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConstraintEditHelper" hint="UML::Constraint" identifier="org.eclipse.papyrus.uml.Constraint" name="UML::Constraint" xmi:id="_SccC-1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_SccC_FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Constraint::ConstrainedElements" identifier="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" name="UML::Constraint::ConstrainedElements" xmi:id="_XHjzcGslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsEditHelperAdvice" xmi:id="_njRJoHbmEeSsxehP964iKQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Constraint::Context" identifier="org.eclipse.papyrus.uml.Constraint.Context" name="UML::Constraint::Context" xmi:id="_ax9dwHZLEeSQEpHemLeWnw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextEditHelperAdvice" xmi:id="_rZSY8HbmEeSsxehP964iKQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Continuation" identifier="org.eclipse.papyrus.uml.Continuation" name="UML::Continuation" xmi:id="_SccDFVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Continuation.gif" xmi:id="_SccDFlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ControlFlowEditHelper" hint="UML::ControlFlow" identifier="org.eclipse.papyrus.uml.ControlFlow" name="UML::ControlFlow" xmi:id="_SccDF1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_SccDGFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlFlow"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ControlNode" identifier="org.eclipse.papyrus.uml.ControlNode" name="UML::ControlNode" xmi:id="_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_Sccp8FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CreateLinkAction" identifier="org.eclipse.papyrus.uml.CreateLinkAction" name="UML::CreateLinkAction" xmi:id="_Sccp8VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkAction.gif" xmi:id="_Sccp8lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CreateLinkObjectAction" identifier="org.eclipse.papyrus.uml.CreateLinkObjectAction" name="UML::CreateLinkObjectAction" xmi:id="_Sccp-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" xmi:id="_Sccp-lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CreateObjectAction" identifier="org.eclipse.papyrus.uml.CreateObjectAction" name="UML::CreateObjectAction" xmi:id="_SccqAVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateObjectAction.gif" xmi:id="_SccqAlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.uml.DataStoreNode" name="UML::DataStoreNode" xmi:id="_SccqCVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_SccqClYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DataStoreNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DataType" identifier="org.eclipse.papyrus.uml.DataType" name="UML::DataType" xmi:id="_SccqC1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_SccqDFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DecisionNode" identifier="org.eclipse.papyrus.uml.DecisionNode" name="UML::DecisionNode" xmi:id="_SccqGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_SccqGlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DecisionNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Dependency" identifier="org.eclipse.papyrus.uml.Dependency" name="UML::Dependency" xmi:id="_SccqG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_SccqHFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::CollaborationUse::RoleBinding" identifier="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" name="UML::CollaborationUse::RoleBinding" xmi:id="_TFofsLhAEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.papyrus.uml.service.types" iconPath="/icons/CollaborationRoleBinding.gif" xmi:id="_m8FswLhAEeSANYuUIb1qQA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RoleBindingHelperAdvice" xmi:id="_Ao6QQLhBEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DeployedArtifact" identifier="org.eclipse.papyrus.uml.DeployedArtifact" name="UML::DeployedArtifact" xmi:id="_SccqI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeployedArtifact.gif" xmi:id="_SccqJFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeployedArtifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DeploymentEditHelper" hint="UML::Deployment" identifier="org.eclipse.papyrus.uml.Deployment" name="UML::Deployment" xmi:id="_SccqJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif" xmi:id="_SccqJlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Deployment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DeploymentSpecification" identifier="org.eclipse.papyrus.uml.DeploymentSpecification" name="UML::DeploymentSpecification" xmi:id="_ScdRAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_ScdRAVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DeploymentTarget" identifier="org.eclipse.papyrus.uml.DeploymentTarget" name="UML::DeploymentTarget" xmi:id="_ScdRDlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentTarget.gif" xmi:id="_ScdRD1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DestroyLinkAction" identifier="org.eclipse.papyrus.uml.DestroyLinkAction" name="UML::DestroyLinkAction" xmi:id="_ScdRFlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyLinkAction.gif" xmi:id="_ScdRF1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DestroyObjectAction" identifier="org.eclipse.papyrus.uml.DestroyObjectAction" name="UML::DestroyObjectAction" xmi:id="_ScdRHlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyObjectAction.gif" xmi:id="_ScdRH1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DestructionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.DestructionOccurrenceSpecification" name="UML::DestructionOccurrenceSpecification" xmi:id="_ScdRJlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" xmi:id="_ScdRJ1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Device" identifier="org.eclipse.papyrus.uml.Device" name="UML::Device" xmi:id="_ScdRKFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_ScdRKVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Device"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DirectedRelationship" identifier="org.eclipse.papyrus.uml.DirectedRelationship" name="UML::DirectedRelationship" xmi:id="_Scd4E1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DirectedRelationship.gif" xmi:id="_Scd4FFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Duration" identifier="org.eclipse.papyrus.uml.Duration" name="UML::Duration" xmi:id="_Scd4FVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Duration.gif" xmi:id="_Scd4FlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Duration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DurationConstraintEditHelper" hint="UML::DurationConstraint" identifier="org.eclipse.papyrus.uml.DurationConstraint" name="UML::DurationConstraint" xmi:id="_Scd4F1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_Scd4GFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DurationInterval" identifier="org.eclipse.papyrus.uml.DurationInterval" name="UML::DurationInterval" xmi:id="_Scd4MVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationInterval.gif" xmi:id="_Scd4MlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationInterval"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DurationObservation" identifier="org.eclipse.papyrus.uml.DurationObservation" name="UML::DurationObservation" xmi:id="_ScefSlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif" xmi:id="_ScefS1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Element" identifier="org.eclipse.papyrus.uml.Element" name="UML::Element" xmi:id="_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ScgUUVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementImportEditHelper" hint="UML::ElementImportBase" identifier="org.eclipse.papyrus.uml.ElementImportBase" name="UML::ElementImportBase" xmi:id="_ScgUUlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_ScgUU1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ElementImport"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::ElementImport" identifier="org.eclipse.papyrus.uml.ElementImport" name="UML::ElementImport" xmi:id="_Dx12sJzPEeSEObywEoz_Cw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_H_ygYAOyEeWv4ca2-olBmg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ElementImportBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementImportEditHelperAdvice" xmi:id="_TB2dEJzPEeSEObywEoz_Cw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::EncapsulatedClassifier" identifier="org.eclipse.papyrus.uml.EncapsulatedClassifier" name="UML::EncapsulatedClassifier" xmi:id="_ScgUVFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EncapsulatedClassifier.gif" xmi:id="_ScgUVVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Enumeration" identifier="org.eclipse.papyrus.uml.Enumeration" name="UML::Enumeration" xmi:id="_ScgUVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_ScgUV1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::EnumerationLiteral" identifier="org.eclipse.papyrus.uml.EnumerationLiteral" name="UML::EnumerationLiteral" xmi:id="_ScgUWFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_ScgUWVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Event" identifier="org.eclipse.papyrus.uml.Event" name="UML::Event" xmi:id="_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_Scg7ZVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Event"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExceptionHandlerEditHelper" hint="UML::ExceptionHandler" identifier="org.eclipse.papyrus.uml.ExceptionHandler" name="UML::ExceptionHandler" xmi:id="_Scg7ZlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExceptionHandler.gif" xmi:id="_Scg7Z1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExceptionHandler"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ExecutableNode" identifier="org.eclipse.papyrus.uml.ExecutableNode" name="UML::ExecutableNode" xmi:id="_Scg7aFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutableNode.gif" xmi:id="_Scg7aVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutableNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExecutionEnvironment" identifier="org.eclipse.papyrus.uml.ExecutionEnvironment" name="UML::ExecutionEnvironment" xmi:id="_Scg7alYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_Scg7a1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionEnvironment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExecutionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" name="UML::ExecutionOccurrenceSpecification" xmi:id="_SchicVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" xmi:id="_SchiclYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionOccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExecutionSpecification" identifier="org.eclipse.papyrus.uml.ExecutionSpecification" name="UML::ExecutionSpecification" xmi:id="_Schic1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionSpecification.gif" xmi:id="_SchidFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionNodeHelper" hint="UML::ExpansionNode" identifier="org.eclipse.papyrus.uml.ExpansionNode" name="UML::ExpansionNode" xmi:id="_SchidVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_SchidlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionRegionHelper" hint="UML::ExpansionRegion" identifier="org.eclipse.papyrus.uml.ExpansionRegion" name="UML::ExpansionRegion" xmi:id="_Schid1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_SchieFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Expression" identifier="org.eclipse.papyrus.uml.Expression" name="UML::Expression" xmi:id="_SchiiFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Expression.gif" xmi:id="_SchiiVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Expression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtendEditHelper" hint="UML::ExtendBase" identifier="org.eclipse.papyrus.uml.ExtendBase" name="UML::ExtendBase" xmi:id="_SciwrFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif" xmi:id="_ScjXoFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Extend"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Extend" identifier="org.eclipse.papyrus.uml.Extend" name="UML::Extend" xmi:id="_kV8SgFrNEeSNSq3G9Z6fKQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif" xmi:id="_t3ycMFrNEeSNSq3G9Z6fKQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExtendBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExtendEditHelperAdvice" xmi:id="_8QiDYFrNEeSNSq3G9Z6fKQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtensionEditHelper" hint="UML::Extension" identifier="org.eclipse.papyrus.uml.Extension" name="UML::Extension" xmi:id="_ScjXoVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif" xmi:id="_ScjXolYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Extension"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExtensionEnd" identifier="org.eclipse.papyrus.uml.ExtensionEnd" name="UML::ExtensionEnd" xmi:id="_ScjXo1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionEnd.gif" xmi:id="_ScjXpFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExtensionPoint" identifier="org.eclipse.papyrus.uml.ExtensionPoint" name="UML::ExtensionPoint" xmi:id="_ScjXq1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_ScjXrFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionPoint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Feature" identifier="org.eclipse.papyrus.uml.Feature" name="UML::Feature" xmi:id="_ScjXuVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Feature.gif" xmi:id="_ScjXulYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::FinalNode" identifier="org.eclipse.papyrus.uml.FinalNode" name="UML::FinalNode" xmi:id="_Scj-sFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalNode.gif" xmi:id="_Scj-sVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::FinalState" identifier="org.eclipse.papyrus.uml.FinalState" name="UML::FinalState" xmi:id="_Scj-slYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif" xmi:id="_ScklwFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalState"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.uml.FlowFinalNode" name="UML::FlowFinalNode" xmi:id="_ScklwVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ScklwlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FlowFinalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ForkNode" identifier="org.eclipse.papyrus.uml.ForkNode" name="UML::ForkNode" xmi:id="_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ScklxFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ForkNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::FunctionBehavior" identifier="org.eclipse.papyrus.uml.FunctionBehavior" name="UML::FunctionBehavior" xmi:id="_ScklxVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif" xmi:id="_ScklxlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FunctionBehavior"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Gate" identifier="org.eclipse.papyrus.uml.Gate" name="UML::Gate" xmi:id="_Sclz6lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Gate.gif" xmi:id="_Sclz61YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Gate"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::GeneralOrdering" identifier="org.eclipse.papyrus.uml.GeneralOrdering" name="UML::GeneralOrdering" xmi:id="_Sclz7FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralOrdering.gif" xmi:id="_Sclz7VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper" hint="UML::Generalization" identifier="org.eclipse.papyrus.uml.Generalization" name="UML::Generalization" xmi:id="_Scma8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_Scma8VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationSetEditHelper" hint="UML::GeneralizationSet" identifier="org.eclipse.papyrus.uml.GeneralizationSet" name="UML::GeneralizationSet" xmi:id="_ScnCAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralizationSet.gif" xmi:id="_ScnCAVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralizationSet"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Image" identifier="org.eclipse.papyrus.uml.Image" name="UML::Image" xmi:id="_ScnCCFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Image.gif" xmi:id="_ScnCCVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Image"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IncludeEditHelper" hint="UML::Include" identifier="org.eclipse.papyrus.uml.Include" name="UML::Include" xmi:id="_ScnCClYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Include.gif" xmi:id="_ScnCC1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Include"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InformationFlowEditHelper" hint="UML::InformationFlowBase" identifier="org.eclipse.papyrus.uml.InformationFlowBase" name="UML::InformationFlowBase" xmi:id="_ScnCDFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ScnCDVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationFlow"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.uml.InformationFlow" name="UML::InformationFlow" xmi:id="_ZLpUILgeEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_jt-DYLgeEeSANYuUIb1qQA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlowBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InformationFlowEditHelperAdvice" xmi:id="_lfPMsLgeEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InformationItem" identifier="org.eclipse.papyrus.uml.InformationItem" name="UML::InformationItem" xmi:id="_ScnCFFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_ScnCFVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationItem"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::InitialNode" identifier="org.eclipse.papyrus.uml.InitialNode" name="UML::InitialNode" xmi:id="_Sco3OVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_Sco3OlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InitialNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::InputPin" identifier="org.eclipse.papyrus.uml.InputPin" name="UML::InputPin" xmi:id="_Sco3O1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_Sco3PFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InstanceSpecificationEditHelper" hint="UML::InstanceSpecification" identifier="org.eclipse.papyrus.uml.InstanceSpecification" name="UML::InstanceSpecification" xmi:id="_Scr6iVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_Scr6ilYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::InstanceSpecification::Link" identifier="org.eclipse.papyrus.uml.InstanceSpecification.Link" name="UML::InstanceSpecification::Link" xmi:id="_bvHrYJXNEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InstanceSpecificationEditHelperAdvice" xmi:id="_bvHrYZXNEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InstanceValue" identifier="org.eclipse.papyrus.uml.InstanceValue" name="UML::InstanceValue" xmi:id="_Scr6kVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceValue.gif" xmi:id="_Scr6klYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceValue"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Interaction" identifier="org.eclipse.papyrus.uml.Interaction" name="UML::Interaction" xmi:id="_SctIsVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif" xmi:id="_SctIslYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionConstraint" identifier="org.eclipse.papyrus.uml.InteractionConstraint" name="UML::InteractionConstraint" xmi:id="_SctIs1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionConstraint.gif" xmi:id="_SctItFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionFragment" identifier="org.eclipse.papyrus.uml.InteractionFragment" name="UML::InteractionFragment" xmi:id="_SctvwlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionFragment.gif" xmi:id="_Sctvw1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionFragment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionOperand" identifier="org.eclipse.papyrus.uml.InteractionOperand" name="UML::InteractionOperand" xmi:id="_SctvxFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionOperand.gif" xmi:id="_SctvxVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionUse" identifier="org.eclipse.papyrus.uml.InteractionUse" name="UML::InteractionUse" xmi:id="_SctvxlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionUse.gif" xmi:id="_Sctvx1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Interface" identifier="org.eclipse.papyrus.uml.Interface" name="UML::Interface" xmi:id="_ScuW2VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_ScuW2lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper" hint="UML::InterfaceRealization" identifier="org.eclipse.papyrus.uml.InterfaceRealization" name="UML::InterfaceRealization" xmi:id="_ScuW21YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_Scvk4FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterruptibleActivityRegionHelper" hint="UML::InterruptibleActivityRegion" identifier="org.eclipse.papyrus.uml.InterruptibleActivityRegion" name="UML::InterruptibleActivityRegion" xmi:id="_ScwL-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_ScwL-lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InterruptibleActivityRegion"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Interval" identifier="org.eclipse.papyrus.uml.Interval" name="UML::Interval" xmi:id="_ScwL-1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interval.gif" xmi:id="_ScwL_FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interval"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IntervalConstraintEditHelper" hint="UML::IntervalConstraint" identifier="org.eclipse.papyrus.uml.IntervalConstraint" name="UML::IntervalConstraint" xmi:id="_ScxaEFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_ScxaEVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//IntervalConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::InvocationAction" identifier="org.eclipse.papyrus.uml.InvocationAction" name="UML::InvocationAction" xmi:id="_Scz2U1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InvocationAction.gif" xmi:id="_Scz2VFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InvocationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::JoinNode" identifier="org.eclipse.papyrus.uml.JoinNode" name="UML::JoinNode" xmi:id="_Scz2VVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_Scz2VlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//JoinNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Lifeline" identifier="org.eclipse.papyrus.uml.Lifeline" name="UML::Lifeline" xmi:id="_Scz2V1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Lifeline.gif" xmi:id="_Scz2WFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::LinkAction" identifier="org.eclipse.papyrus.uml.LinkAction" name="UML::LinkAction" xmi:id="_Scz2WVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkAction.gif" xmi:id="_Scz2WlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LinkEndCreationData" identifier="org.eclipse.papyrus.uml.LinkEndCreationData" name="UML::LinkEndCreationData" xmi:id="_Scz2W1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkEndCreationData.gif" xmi:id="_Scz2XFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndCreationData"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LinkEndData" identifier="org.eclipse.papyrus.uml.LinkEndData" name="UML::LinkEndData" xmi:id="_Scz2XVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkEndData.gif" xmi:id="_Scz2XlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndData"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LinkEndDestructionData" identifier="org.eclipse.papyrus.uml.LinkEndDestructionData" name="UML::LinkEndDestructionData" xmi:id="_Scz2X1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkEndDestructionData.gif" xmi:id="_Scz2YFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndDestructionData"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralBoolean" identifier="org.eclipse.papyrus.uml.LiteralBoolean" name="UML::LiteralBoolean" xmi:id="_Scz2YVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralBoolean.gif" xmi:id="_Scz2YlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralBoolean"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.LiteralIntegerEditHelper" hint="UML::LiteralInteger" identifier="org.eclipse.papyrus.uml.LiteralInteger" name="UML::LiteralInteger" xmi:id="_Sc1EflYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralInteger.gif" xmi:id="_Sc1Ef1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralNull" identifier="org.eclipse.papyrus.uml.LiteralNull" name="UML::LiteralNull" xmi:id="_Sc2Sk1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralNull.gif" xmi:id="_Sc2SlFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralNull"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralReal" identifier="org.eclipse.papyrus.uml.LiteralReal" name="UML::LiteralReal" xmi:id="_Sc25v1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralReal.gif" xmi:id="_Sc25wFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralReal"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralSpecification" identifier="org.eclipse.papyrus.uml.LiteralSpecification" name="UML::LiteralSpecification" xmi:id="_Sc4HxlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralSpecification.gif" xmi:id="_Sc4Hx1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralString" identifier="org.eclipse.papyrus.uml.LiteralString" name="UML::LiteralString" xmi:id="_Sc4HyFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralString.gif" xmi:id="_Sc4HyVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralString"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralUnlimitedNatural" identifier="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" name="UML::LiteralUnlimitedNatural" xmi:id="_Sc4u7FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" xmi:id="_Sc4u7VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralUnlimitedNatural"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper" hint="UML::LoopNode" identifier="org.eclipse.papyrus.uml.LoopNode" name="UML::LoopNode" xmi:id="_Sc58-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_Sc58-lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ManifestationEditHelper" hint="UML::Manifestation" identifier="org.eclipse.papyrus.uml.Manifestation" name="UML::Manifestation" xmi:id="_Sc59ClYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_Sc59C1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Manifestation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::MergeNode" identifier="org.eclipse.papyrus.uml.MergeNode" name="UML::MergeNode" xmi:id="_Sc59ElYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_Sc59E1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MergeNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper" hint="UML::Message" identifier="org.eclipse.papyrus.uml.Message" name="UML::Message" xmi:id="_Sc59FFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message.gif" xmi:id="_Sc59FVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MessageEnd" identifier="org.eclipse.papyrus.uml.MessageEnd" name="UML::MessageEnd" xmi:id="_Sc59FlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MessageEnd.gif" xmi:id="_Sc59F1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MessageEvent" identifier="org.eclipse.papyrus.uml.MessageEvent" name="UML::MessageEvent" xmi:id="_Sc59GFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MessageEvent.gif" xmi:id="_Sc59GVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MessageOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" name="UML::MessageOccurrenceSpecification" xmi:id="_Sc6kAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" xmi:id="_Sc6kAVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageOccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Model" identifier="org.eclipse.papyrus.uml.Model" name="UML::Model" xmi:id="_Sc6kAlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_Sc6kA1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Model"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MultiplicityElement" identifier="org.eclipse.papyrus.uml.MultiplicityElement" name="UML::MultiplicityElement" xmi:id="_Sc6kClYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MultiplicityElement.gif" xmi:id="_Sc6kC1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::NamedElement" identifier="org.eclipse.papyrus.uml.NamedElement" name="UML::NamedElement" xmi:id="_Sc6kDFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_Sc6kDVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Namespace" identifier="org.eclipse.papyrus.uml.Namespace" name="UML::Namespace" xmi:id="_Sc6kDlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Namespace.gif" xmi:id="_Sc6kD1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Node" identifier="org.eclipse.papyrus.uml.Node" name="UML::Node" xmi:id="_Sc6kEFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_Sc6kEVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Node"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObjectFlowEditHelper" hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.uml.ObjectFlow" name="UML::ObjectFlow" xmi:id="_Sc6kJFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_Sc6kJVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectFlow"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ObjectNode" identifier="org.eclipse.papyrus.uml.ObjectNode" name="UML::ObjectNode" xmi:id="_Sc6kJlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectNode.gif" xmi:id="_Sc6kJ1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Observation" identifier="org.eclipse.papyrus.uml.Observation" name="UML::Observation" xmi:id="_Sc6kKFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Observation.gif" xmi:id="_Sc6kKVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Observation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OccurrenceSpecification" identifier="org.eclipse.papyrus.uml.OccurrenceSpecification" name="UML::OccurrenceSpecification" xmi:id="_Sc6kKlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" xmi:id="_Sc7LEFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.uml.OpaqueAction" name="UML::OpaqueAction" xmi:id="_Sc7LEVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_Sc7LElYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.uml.OpaqueBehavior" name="UML::OpaqueBehavior" xmi:id="_Sc7LGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_Sc7LGlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.uml.OpaqueExpression" name="UML::OpaqueExpression" xmi:id="_Sc7yIVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_Sc7yIlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueExpression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Operation" identifier="org.eclipse.papyrus.uml.Operation" name="UML::Operation" xmi:id="_Sc8ZVFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Sc8ZVVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OperationTemplateParameterBase" identifier="org.eclipse.papyrus.uml.OperationTemplateParameterBase" name="UML::OperationTemplateParameterBase" xmi:id="_Sc8ZVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" xmi:id="_Sc8ZV1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OperationTemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::OperationTemplateParameter" identifier="org.eclipse.papyrus.uml.OperationTemplateParameter" name="UML::OperationTemplateParameter" xmi:id="_vg_QMJXJEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.OperationTemplateParameterBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OperationTemplateParameterEditHelperAdvice" xmi:id="_vg_QMZXJEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::OutputPin" identifier="org.eclipse.papyrus.uml.OutputPin" name="UML::OutputPin" xmi:id="_Sc9AQ1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_Sc9ARFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Package" identifier="org.eclipse.papyrus.uml.Package" name="UML::Package" xmi:id="_Sc9nZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_Sc9nZlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageImportEditHelper" hint="UML::PackageImportBase" identifier="org.eclipse.papyrus.uml.PackageImportBase" name="UML::PackageImportBase" xmi:id="_Sc9nZ1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_Sc9naFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageImport"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageImport" identifier="org.eclipse.papyrus.uml.PackageImport" name="UML::PackageImport" xmi:id="_8kkk8GN5EeSrwvaW5Is9PQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_WI3T4AOyEeWv4ca2-olBmg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageImportBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageImportEditHelperAdvice" xmi:id="_LSLo4GN6EeSrwvaW5Is9PQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageMergeEditHelper" hint="UML::PackageMergeBase" identifier="org.eclipse.papyrus.uml.PackageMergeBase" name="UML::PackageMergeBase" xmi:id="_Sc9naVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_Sc9nalYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageMerge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PackageMerge" identifier="org.eclipse.papyrus.uml.PackageMerge" name="UML::PackageMerge" xmi:id="_5VbKkGOIEeSw8rz5ZQEURQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_697XIAOyEeWv4ca2-olBmg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.PackageMergeBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageMergeEditHelperAdvice" xmi:id="_EJxd8GOJEeSw8rz5ZQEURQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::PackageableElement" identifier="org.eclipse.papyrus.uml.PackageableElement" name="UML::PackageableElement" xmi:id="_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_Sc9nclYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Parameter" identifier="org.eclipse.papyrus.uml.Parameter" name="UML::Parameter" xmi:id="_Sc9nc1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_Sc9ndFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ParameterSet" identifier="org.eclipse.papyrus.uml.ParameterSet" name="UML::ParameterSet" xmi:id="_Sc9ndVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterSet.gif" xmi:id="_Sc9ndlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterSet"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ParameterableElement" identifier="org.eclipse.papyrus.uml.ParameterableElement" name="UML::ParameterableElement" xmi:id="_Sc-OZlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterableElement.gif" xmi:id="_Sc-OZ1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::PartDecomposition" identifier="org.eclipse.papyrus.uml.PartDecomposition" name="UML::PartDecomposition" xmi:id="_Sc-OaFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PartDecomposition.gif" xmi:id="_Sc-OaVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PartDecomposition"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::Pin" identifier="org.eclipse.papyrus.uml.Pin" name="UML::Pin" xmi:id="_Sc-OalYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pin.gif" xmi:id="_Sc-Oa1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Pin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper" hint="UML::Port" identifier="org.eclipse.papyrus.uml.Port" name="UML::Port" xmi:id="_Sc-ObFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_Sc-ObVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::PrimitiveType" identifier="org.eclipse.papyrus.uml.PrimitiveType" name="UML::PrimitiveType" xmi:id="_Sc-OdFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_Sc-OdVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Profile" identifier="org.eclipse.papyrus.uml.Profile" name="UML::Profile" xmi:id="_Sc-OglYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_Sc-Og1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ProfileApplication" identifier="org.eclipse.papyrus.uml.ProfileApplication" name="UML::ProfileApplication" xmi:id="_Sc-OhFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_Sc-OhVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProfileApplication"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Property" identifier="org.eclipse.papyrus.uml.Property" name="UML::Property" xmi:id="_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_Sc-1cVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::PropertyPart" identifier="org.eclipse.papyrus.uml.PropertyPart" name="UML::PropertyPart" xmi:id="_wdkpELhLEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_5SIO8LhLEeSANYuUIb1qQA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyPartHelperAdvice" xmi:id="_509PMLhLEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolConformanceEditHelper" hint="UML::ProtocolConformance" identifier="org.eclipse.papyrus.uml.ProtocolConformance" name="UML::ProtocolConformance" xmi:id="_Sc-1eFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolConformance.gif" xmi:id="_Sc-1eVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolConformance"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolStateMachineEditHelper" hint="UML::ProtocolStateMachine" identifier="org.eclipse.papyrus.uml.ProtocolStateMachine" name="UML::ProtocolStateMachine" xmi:id="_Sc-1elYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" xmi:id="_Sc-1e1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolStateMachine"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ProtocolTransition" identifier="org.eclipse.papyrus.uml.ProtocolTransition" name="UML::ProtocolTransition" xmi:id="_Sc-1oFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolTransition.gif" xmi:id="_Sc_cgFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolTransition"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Pseudostate" identifier="org.eclipse.papyrus.uml.Pseudostate" name="UML::Pseudostate" xmi:id="_Sc_cgVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_Sc_cglYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::QualifierValue" identifier="org.eclipse.papyrus.uml.QualifierValue" name="UML::QualifierValue" xmi:id="_Sc_cg1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/QualifierValue.gif" xmi:id="_Sc_chFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//QualifierValue"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::RaiseExceptionAction" identifier="org.eclipse.papyrus.uml.RaiseExceptionAction" name="UML::RaiseExceptionAction" xmi:id="_Sc_chVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RaiseExceptionAction.gif" xmi:id="_Sc_chlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RaiseExceptionAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadExtentAction" identifier="org.eclipse.papyrus.uml.ReadExtentAction" name="UML::ReadExtentAction" xmi:id="_Sc_cjVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadExtentAction.gif" xmi:id="_Sc_cjlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadExtentAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadIsClassifiedObjectAction" identifier="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" name="UML::ReadIsClassifiedObjectAction" xmi:id="_Sc_clVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" xmi:id="_Sc_cllYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadIsClassifiedObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadLinkAction" identifier="org.eclipse.papyrus.uml.ReadLinkAction" name="UML::ReadLinkAction" xmi:id="_Sc_cnVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkAction.gif" xmi:id="_Sc_cnlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadLinkObjectEndAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" name="UML::ReadLinkObjectEndAction" xmi:id="_Sc_cpVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkObjectEndAction.gif" xmi:id="_Sc_cplYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadLinkObjectEndQualifierAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" name="UML::ReadLinkObjectEndQualifierAction" xmi:id="_Sc_crVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" xmi:id="_Sc_crlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndQualifierAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadSelfAction" identifier="org.eclipse.papyrus.uml.ReadSelfAction" name="UML::ReadSelfAction" xmi:id="_SdADk1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadSelfAction.gif" xmi:id="_SdADlFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadSelfAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" name="UML::ReadStructuralFeatureAction" xmi:id="_SdADm1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" xmi:id="_SdADnFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadStructuralFeatureAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadVariableAction" identifier="org.eclipse.papyrus.uml.ReadVariableAction" name="UML::ReadVariableAction" xmi:id="_SdADo1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadVariableAction.gif" xmi:id="_SdADpFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadVariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Realization" identifier="org.eclipse.papyrus.uml.Realization" name="UML::Realization" xmi:id="_SdADq1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_SdADrFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Realization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Reception" identifier="org.eclipse.papyrus.uml.Reception" name="UML::Reception" xmi:id="_SdADs1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_SdADtFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Reception"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReclassifyObjectAction" identifier="org.eclipse.papyrus.uml.ReclassifyObjectAction" name="UML::ReclassifyObjectAction" xmi:id="_SdAqoFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" xmi:id="_SdAqoVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReclassifyObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::RedefinableElement" identifier="org.eclipse.papyrus.uml.RedefinableElement" name="UML::RedefinableElement" xmi:id="_SdAqqFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableElement.gif" xmi:id="_SdAqqVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::RedefinableTemplateSignature" identifier="org.eclipse.papyrus.uml.RedefinableTemplateSignature" name="UML::RedefinableTemplateSignature" xmi:id="_SdAqqlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" xmi:id="_SdAqq1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableTemplateSignature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReduceAction" identifier="org.eclipse.papyrus.uml.ReduceAction" name="UML::ReduceAction" xmi:id="_SdAqrFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReduceAction.gif" xmi:id="_SdAqrVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReduceAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.RegionEditHelper" hint="UML::Region" identifier="org.eclipse.papyrus.uml.Region" name="UML::Region" xmi:id="_SdBRtlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif" xmi:id="_SdBRt1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Relationship" identifier="org.eclipse.papyrus.uml.Relationship" name="UML::Relationship" xmi:id="_SdBRuFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Relationship.gif" xmi:id="_SdBRuVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::RemoveStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" name="UML::RemoveStructuralFeatureValueAction" xmi:id="_SdBRulYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" xmi:id="_SdBRu1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveStructuralFeatureValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::RemoveVariableValueAction" identifier="org.eclipse.papyrus.uml.RemoveVariableValueAction" name="UML::RemoveVariableValueAction" xmi:id="_SdBRwlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RemoveVariableValueAction.gif" xmi:id="_SdBRw1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveVariableValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReplyAction" identifier="org.eclipse.papyrus.uml.ReplyAction" name="UML::ReplyAction" xmi:id="_SdBRylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReplyAction.gif" xmi:id="_SdBRy1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReplyAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::SendObjectAction" identifier="org.eclipse.papyrus.uml.SendObjectAction" name="UML::SendObjectAction" xmi:id="_SdBR0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_SdBR01YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::SendSignalAction" identifier="org.eclipse.papyrus.uml.SendSignalAction" name="UML::SendSignalAction" xmi:id="_SdB4xlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendSignalAction.gif" xmi:id="_SdB4x1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SequenceNodeHelper" hint="UML::SequenceNode" identifier="org.eclipse.papyrus.uml.SequenceNode" name="UML::SequenceNode" xmi:id="_SdB4zlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif" xmi:id="_SdB4z1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SequenceNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Signal" identifier="org.eclipse.papyrus.uml.Signal" name="UML::Signal" xmi:id="_SdB431YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_SdB44FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::SignalEvent" identifier="org.eclipse.papyrus.uml.SignalEvent" name="UML::SignalEvent" xmi:id="_SdB44VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SignalEvent.gif" xmi:id="_SdB44lYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Slot" identifier="org.eclipse.papyrus.uml.Slot" name="UML::Slot" xmi:id="_SdCf4lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_SdCf41YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Slot"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::StartClassifierBehaviorAction" identifier="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" name="UML::StartClassifierBehaviorAction" xmi:id="_SdCf5FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" xmi:id="_SdCf5VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StartClassifierBehaviorAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::StartObjectBehaviorAction" identifier="org.eclipse.papyrus.uml.StartObjectBehaviorAction" name="UML::StartObjectBehaviorAction" xmi:id="_SdCf7FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" xmi:id="_SdCf7VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::State" identifier="org.eclipse.papyrus.uml.State" name="UML::State" xmi:id="_SdCf9FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif" xmi:id="_SdCf9VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StateInvariant" identifier="org.eclipse.papyrus.uml.StateInvariant" name="UML::StateInvariant" xmi:id="_SdCf9lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateInvariant.gif" xmi:id="_SdCf91YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StateMachine" identifier="org.eclipse.papyrus.uml.StateMachine" name="UML::StateMachine" xmi:id="_SdCf-FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_SdCf-VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Stereotype" identifier="org.eclipse.papyrus.uml.Stereotype" name="UML::Stereotype" xmi:id="_SdDG91YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_SdDG-FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StringExpression" identifier="org.eclipse.papyrus.uml.StringExpression" name="UML::StringExpression" xmi:id="_SdDHBVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif" xmi:id="_SdDHBlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StringExpression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StructuralFeature" identifier="org.eclipse.papyrus.uml.StructuralFeature" name="UML::StructuralFeature" xmi:id="_SdGKSFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuralFeature.gif" xmi:id="_SdGKSVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::StructuralFeatureAction" identifier="org.eclipse.papyrus.uml.StructuralFeatureAction" name="UML::StructuralFeatureAction" xmi:id="_SdGKSlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuralFeatureAction.gif" xmi:id="_SdGKS1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeatureAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper" hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.uml.StructuredActivityNode" name="UML::StructuredActivityNode" xmi:id="_SdGxQFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_SdGxQVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredActivityNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StructuredClassifier" identifier="org.eclipse.papyrus.uml.StructuredClassifier" name="UML::StructuredClassifier" xmi:id="_SdGxUVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredClassifier.gif" xmi:id="_SdGxUlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SubstitutionEditHelper" hint="UML::Substitution" identifier="org.eclipse.papyrus.uml.Substitution" name="UML::Substitution" xmi:id="_SdGxU1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_SdGxVFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Substitution"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TemplateBindingEditHelper" hint="UML::TemplateBinding" identifier="org.eclipse.papyrus.uml.TemplateBinding" name="UML::TemplateBinding" xmi:id="_SdHYW1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateBinding.gif" xmi:id="_SdHYXFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateParameterBase" identifier="org.eclipse.papyrus.uml.TemplateParameterBase" name="UML::TemplateParameterBase" xmi:id="_SdHYXVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameter.gif" xmi:id="_SdHYXlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::TemplateParameter" identifier="org.eclipse.papyrus.uml.TemplateParameter" name="UML::TemplateParameter" xmi:id="_JCgQsJXMEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.papyrus.uml.TemplateParameterBase</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateParameterEditHelperAdvice" xmi:id="_JCgQsZXMEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateParameterSubstitution" identifier="org.eclipse.papyrus.uml.TemplateParameterSubstitution" name="UML::TemplateParameterSubstitution" xmi:id="_SdHYX1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameterSubstitution.gif" xmi:id="_SdHYYFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateSignature" identifier="org.eclipse.papyrus.uml.TemplateSignature" name="UML::TemplateSignature" xmi:id="_SdHYYVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateSignature.gif" xmi:id="_SdHYYlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateSignature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateableElement" identifier="org.eclipse.papyrus.uml.TemplateableElement" name="UML::TemplateableElement" xmi:id="_SdHYY1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateableElement.gif" xmi:id="_SdHYZFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::TestIdentityAction" identifier="org.eclipse.papyrus.uml.TestIdentityAction" name="UML::TestIdentityAction" xmi:id="_SdHYZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TestIdentityAction.gif" xmi:id="_SdHYZlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TimeConstraintEditHelper" hint="UML::TimeConstraint" identifier="org.eclipse.papyrus.uml.TimeConstraint" name="UML::TimeConstraint" xmi:id="_SdHYbVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_SdHYblYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeEvent" identifier="org.eclipse.papyrus.uml.TimeEvent" name="UML::TimeEvent" xmi:id="_SdH_eFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeEvent.gif" xmi:id="_SdH_eVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeExpression" identifier="org.eclipse.papyrus.uml.TimeExpression" name="UML::TimeExpression" xmi:id="_SdImcFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeExpression.gif" xmi:id="_SdImcVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeExpression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeInterval" identifier="org.eclipse.papyrus.uml.TimeInterval" name="UML::TimeInterval" xmi:id="_SdJNklYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeInterval.gif" xmi:id="_SdJNk1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeInterval"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeObservation" identifier="org.eclipse.papyrus.uml.TimeObservation" name="UML::TimeObservation" xmi:id="_SdKbvlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif" xmi:id="_SdKbv1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TransitionEditHelper" hint="UML::Transition" identifier="org.eclipse.papyrus.uml.Transition" name="UML::Transition" xmi:id="_SdLCtVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition.gif" xmi:id="_SdLCtlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Transition"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Trigger" identifier="org.eclipse.papyrus.uml.Trigger" name="UML::Trigger" xmi:id="_SdLCt1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Trigger.gif" xmi:id="_SdLCuFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Trigger"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Type" identifier="org.eclipse.papyrus.uml.Type" name="UML::Type" xmi:id="_SdLCuVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Type.gif" xmi:id="_SdLCulYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TypedElement" identifier="org.eclipse.papyrus.uml.TypedElement" name="UML::TypedElement" xmi:id="_SdLCu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_SdLCvFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::UnmarshallAction" identifier="org.eclipse.papyrus.uml.UnmarshallAction" name="UML::UnmarshallAction" xmi:id="_SdLCvVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UnmarshallAction.gif" xmi:id="_SdLCvlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//UnmarshallAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Usage" identifier="org.eclipse.papyrus.uml.Usage" name="UML::Usage" xmi:id="_SdLCxVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_SdLCxlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Usage"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.UseCaseEditHelper" hint="UML::UseCase" identifier="org.eclipse.papyrus.uml.UseCase" name="UML::UseCase" xmi:id="_SdLCzVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_SdLCzlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ValuePin" identifier="org.eclipse.papyrus.uml.ValuePin" name="UML::ValuePin" xmi:id="_SdLp11YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_SdLp2FYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValuePin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ValueSpecification" identifier="org.eclipse.papyrus.uml.ValueSpecification" name="UML::ValueSpecification" xmi:id="_SdM3_1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecification.gif" xmi:id="_SdM4AFYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ValueSpecificationAction" identifier="org.eclipse.papyrus.uml.ValueSpecificationAction" name="UML::ValueSpecificationAction" xmi:id="_SdM4AVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" xmi:id="_SdM4AlYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecificationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Variable" identifier="org.eclipse.papyrus.uml.Variable" name="UML::Variable" xmi:id="_SdNe8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Variable.gif" xmi:id="_SdNe8VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Variable"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::VariableAction" identifier="org.eclipse.papyrus.uml.VariableAction" name="UML::VariableAction" xmi:id="_SdNe8lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/VariableAction.gif" xmi:id="_SdNe81YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//VariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Vertex" identifier="org.eclipse.papyrus.uml.Vertex" name="UML::Vertex" xmi:id="_SdNe-lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Vertex.gif" xmi:id="_SdNe-1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Vertex"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::WriteLinkAction" identifier="org.eclipse.papyrus.uml.WriteLinkAction" name="UML::WriteLinkAction" xmi:id="_SdNe_FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/WriteLinkAction.gif" xmi:id="_SdNe_VYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::WriteStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" name="UML::WriteStructuralFeatureAction" xmi:id="_SdNe_lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/WriteStructuralFeatureAction.gif" xmi:id="_SdNe_1YCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::WriteVariableAction" identifier="org.eclipse.papyrus.uml.WriteVariableAction" name="UML::WriteVariableAction" xmi:id="_SdNfAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/WriteVariableAction.gif" xmi:id="_SdNfAVYCEeS0WsAAtVmToA"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteVariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Trace" identifier="org.eclipse.papyrus.uml.Trace" name="UML::Trace" xmi:id="_JPmakGskEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_QcxB0AO0EeWv4ca2-olBmg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TraceEditHelperAdvice" xmi:id="_JPmakWskEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.TraceMatcher" xmi:id="_LDOUUGskEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Refine" identifier="org.eclipse.papyrus.uml.Refine" name="UML::Refine" xmi:id="_UGdZ8GslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_N0U_8AO0EeWv4ca2-olBmg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RefineEditHelperAdvice" xmi:id="_UGdZ8WslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-    <matcherConfiguration matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.RefineMatcher" xmi:id="_UGdZ8mslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations description="Created to support the ContainmentLink" hint="UML::Element::OwnedElement" identifier="org.eclipse.papyrus.uml.Element.OwnedElement" name="UML::Element::OwnedElement" xmi:id="_xVU0MHlEEeSDaJF_npeEXw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>
-    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementEditHelperAdvice" xmi:id="_JdUX4MHTEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Containment" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConstraintConstrainedElementsReorient" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA" xmi:id="_6AWx0MJaEeSl6M4_Zhyt7Q" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.CommentAnnotatedElementsReorient" inheritance="all" target="_Scbb2FYCEeS0WsAAtVmToA" xmi:id="_Biw5sMdFEeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextReorient" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA" xmi:id="_UdTKsMJbEeSl6M4_Zhyt7Q" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA" xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Classifier" inheritance="all" target="_Sca0z1YCEeS0WsAAtVmToA" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Collaboration" target="_Sca07VYCEeS0WsAAtVmToA" xmi:id="_R_pDcmT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.CollaborationUse" target="_Sca071YCEeS0WsAAtVmToA" xmi:id="_R_pDc2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Connector" inheritance="all" target="_SccC9VYCEeS0WsAAtVmToA" xmi:id="_R_pDdGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConnectorEnd" target="_SccC91YCEeS0WsAAtVmToA" xmi:id="_R_pDdWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.EncapsulatedClassifierHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.EncapsulatedClassifier" inheritance="all" target="_ScgUVFYCEeS0WsAAtVmToA" xmi:id="_R_pqgGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ExecutionSpecification" inheritance="all" target="_Schic1YCEeS0WsAAtVmToA" xmi:id="_R_pqgWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Lifeline" inheritance="all" target="_Scz2V1YCEeS0WsAAtVmToA" xmi:id="_R_pqg2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Message" inheritance="all" target="_Sc59FFYCEeS0WsAAtVmToA" xmi:id="_R_pqhGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.MessageEnd" inheritance="all" target="_Sc59FlYCEeS0WsAAtVmToA" xmi:id="_R_pqhWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.NamedElement" inheritance="all" target="_Sc6kDFYCEeS0WsAAtVmToA" xmi:id="_R_pqhmT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.NamedElementNameInitializer" inheritance="all" target="_Sc6kDFYCEeS0WsAAtVmToA" xmi:id="_R_pqh2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" inheritance="all" target="_Sc6kKlYCEeS0WsAAtVmToA" xmi:id="_R_pqiGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ParameterHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Parameter" inheritance="all" target="_Sc9nc1YCEeS0WsAAtVmToA" xmi:id="_R_pqiWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.PartDecomposition" target="_Sc-OaFYCEeS0WsAAtVmToA" xmi:id="_R_pqimT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Property" inheritance="all" target="_Sc-1cFYCEeS0WsAAtVmToA" xmi:id="_R_pqi2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StructuredClassifierHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.StructuredClassifier" inheritance="all" target="_SdGxUVYCEeS0WsAAtVmToA" xmi:id="_R_pqjGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityNodeHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ActivityNode" inheritance="all" target="_ScTgJVYCEeS0WsAAtVmToA" xmi:id="_R_pqjWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityGroupEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ActivityGroup" inheritance="all" target="_ScTgI1YCEeS0WsAAtVmToA" xmi:id="_R_pqjmT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations description="Advice for stereotype applications, primarily supplying them as dependents in the destruction of their base element." editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypeApplicationAdvice" identifier="org.eclipse.papyrus.uml.advice.StereotypeApplication" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA" xmi:id="_yHsHwOg-EeSqZs7o0maBIQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateableElementEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.TemplateableElement" inheritance="all" target="_SdHYY1YCEeS0WsAAtVmToA" xmi:id="_OGm-gAR_EeWEmNqzWv7tuw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations description="Advice that tweaks requests to provide hints to the read-only advice" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UMLReadOnlyHintsAdvice" identifier="org.eclipse.papyrus.uml.advice.UMLReadOnlyHints" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA" xmi:id="_hjfH8DCzEeWM9ILC16rEvw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice_CommunicationPath" target="_Scbb2lYCEeS0WsAAtVmToA" xmi:id="_SJGO0DWbEeWdwYNHBiYLiA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.uml.service.types.UMLElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="UMLElementTypeSet" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Abstraction" identifier="org.eclipse.papyrus.uml.Abstraction" name="UML::Abstraction" xmi:id="_ScP1oVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_ScP1olYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Abstraction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AcceptCallAction" identifier="org.eclipse.papyrus.uml.AcceptCallAction" name="UML::AcceptCallAction" xmi:id="_ScQcs1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptCallAction.gif" xmi:id="_ScQctFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptCallAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AcceptEventAction" identifier="org.eclipse.papyrus.uml.AcceptEventAction" name="UML::AcceptEventAction" xmi:id="_ScQcu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_ScQcvFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptEventAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::Action" identifier="org.eclipse.papyrus.uml.Action" name="UML::Action" xmi:id="_ScRDxFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Action.gif" xmi:id="_ScRDxVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Action"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ActionExecutionSpecification" identifier="org.eclipse.papyrus.uml.ActionExecutionSpecification" name="UML::ActionExecutionSpecification" xmi:id="_ScRDxlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" xmi:id="_ScRDx1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActionInputPin" identifier="org.eclipse.papyrus.uml.ActionInputPin" name="UML::ActionInputPin" xmi:id="_ScRDyFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif" xmi:id="_ScRDyVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionInputPin"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityHelper" hint="UML::Activity" identifier="org.eclipse.papyrus.uml.Activity" name="UML::Activity" xmi:id="_ScTgG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_ScTgHFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ActivityContent" identifier="org.eclipse.papyrus.uml.ActivityContent" name="UML::ActivityContent" xmi:id="_ScTgHVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityContent.gif" xmi:id="_ScTgHlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityContent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ActivityEdge" identifier="org.eclipse.papyrus.uml.ActivityEdge" name="UML::ActivityEdge" xmi:id="_ScTgH1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityEdge.gif" xmi:id="_ScTgIFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityEdge"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActivityFinalNode" identifier="org.eclipse.papyrus.uml.ActivityFinalNode" name="UML::ActivityFinalNode" xmi:id="_ScTgIVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif" xmi:id="_ScTgIlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityFinalNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityGroupHelper" hint="UML::ActivityGroup" identifier="org.eclipse.papyrus.uml.ActivityGroup" name="UML::ActivityGroup" xmi:id="_ScTgI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityGroup.gif" xmi:id="_ScTgJFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityGroup"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActivityNode" identifier="org.eclipse.papyrus.uml.ActivityNode" name="UML::ActivityNode" xmi:id="_ScTgJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityNode.gif" xmi:id="_ScTgJlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ActivityParameterNode" identifier="org.eclipse.papyrus.uml.ActivityParameterNode" name="UML::ActivityParameterNode" xmi:id="_ScTgJ1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_ScTgKFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityPartitionEditHelper" hint="UML::ActivityPartition" identifier="org.eclipse.papyrus.uml.ActivityPartition" name="UML::ActivityPartition" xmi:id="_ScTgKVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ScTgKlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityPartition"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Actor" identifier="org.eclipse.papyrus.uml.Actor" name="UML::Actor" xmi:id="_ScV8UVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_ScV8UlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Actor"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AddStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" name="UML::AddStructuralFeatureValueAction" xmi:id="_ScWjU1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" xmi:id="_ScWjVFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::AddVariableValueAction" identifier="org.eclipse.papyrus.uml.AddVariableValueAction" name="UML::AddVariableValueAction" xmi:id="_ScWjW1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddVariableValueAction.gif" xmi:id="_ScWjXFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::AnyReceiveEvent" identifier="org.eclipse.papyrus.uml.AnyReceiveEvent" name="UML::AnyReceiveEvent" xmi:id="_ScXKYFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" xmi:id="_ScXKYVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AnyReceiveEvent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Artifact" identifier="org.eclipse.papyrus.uml.Artifact" name="UML::Artifact" xmi:id="_ScXKaFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif" xmi:id="_ScXKaVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Artifact"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper" hint="UML::AssociationBase" identifier="org.eclipse.papyrus.uml.AssociationBase" name="UML::AssociationBase" xmi:id="_ScXxdFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_ScXxdVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Association"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Association" identifier="org.eclipse.papyrus.uml.Association" name="UML::Association" xmi:id="_f8dpoFYTEeSx49G4xBUj9Q" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_vYYlEFYTEeSx49G4xBUj9Q"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AssociationBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice" xmi:id="_4Jz-cFYTEeSx49G4xBUj9Q" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher" xmi:id="_-lvgEFYTEeSx49G4xBUj9Q" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper" hint="UML::AssociationClassBase" identifier="org.eclipse.papyrus.uml.AssociationClassBase" name="UML::AssociationClassBase" xmi:id="_ScXxdlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_ScXxd1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AssociationClass"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::AssociationClass" identifier="org.eclipse.papyrus.uml.AssociationClass" name="UML::AssociationClass" xmi:id="_2JgRAHV3EeScr8rbRObDkA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif" xmi:id="_2Jg4EHV3EeScr8rbRObDkA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.AssociationClassBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice" xmi:id="_2Jg4EXV3EeScr8rbRObDkA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Behavior" identifier="org.eclipse.papyrus.uml.Behavior" name="UML::Behavior" xmi:id="_ScaNsFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Behavior.gif" xmi:id="_ScaNsVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::BehaviorExecutionSpecification" identifier="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" name="UML::BehaviorExecutionSpecification" xmi:id="_ScaNslYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" xmi:id="_ScaNs1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::BehavioralFeature" identifier="org.eclipse.papyrus.uml.BehavioralFeature" name="UML::BehavioralFeature" xmi:id="_ScaNtFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehavioralFeature.gif" xmi:id="_ScaNtVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.BehavioredClassifierEditHelper" hint="UML::BehavioredClassifier" identifier="org.eclipse.papyrus.uml.BehavioredClassifier" name="UML::BehavioredClassifier" xmi:id="_ScaNtlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehavioredClassifier.gif" xmi:id="_ScaNt1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::BroadcastSignalAction" identifier="org.eclipse.papyrus.uml.BroadcastSignalAction" name="UML::BroadcastSignalAction" xmi:id="_ScaNuFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" xmi:id="_ScaNuVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BroadcastSignalAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CallAction" identifier="org.eclipse.papyrus.uml.CallAction" name="UML::CallAction" xmi:id="_ScaNwFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallAction.gif" xmi:id="_ScaNwVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CallBehaviorAction" identifier="org.eclipse.papyrus.uml.CallBehaviorAction" name="UML::CallBehaviorAction" xmi:id="_ScaNwlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_ScaNw1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallBehaviorAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::CallEvent" identifier="org.eclipse.papyrus.uml.CallEvent" name="UML::CallEvent" xmi:id="_ScaNylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallEvent.gif" xmi:id="_ScaNy1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CallOperationAction" identifier="org.eclipse.papyrus.uml.CallOperationAction" name="UML::CallOperationAction" xmi:id="_ScaN0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_ScaN01YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CentralBufferNode" identifier="org.eclipse.papyrus.uml.CentralBufferNode" name="UML::CentralBufferNode" xmi:id="_ScaN2lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CentralBufferNode.gif" xmi:id="_ScaN21YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CentralBufferNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ChangeEvent" identifier="org.eclipse.papyrus.uml.ChangeEvent" name="UML::ChangeEvent" xmi:id="_ScaN3FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ChangeEvent.gif" xmi:id="_ScaN3VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ChangeEvent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ClassEditHelper" hint="UML::Class" identifier="org.eclipse.papyrus.uml.Class" name="UML::Class" xmi:id="_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_Sca0wlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Classifier" identifier="org.eclipse.papyrus.uml.Classifier" name="UML::Classifier" xmi:id="_Sca0z1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Classifier.gif" xmi:id="_Sca00FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ClassifierTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase" name="UML::ClassifierTemplateParameterBase" xmi:id="_Sca00VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" xmi:id="_Sca00lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClassifierTemplateParameter"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ClassifierTemplateParameter" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameter" name="UML::ClassifierTemplateParameter" xmi:id="_kyfxEH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.ClassifierTemplateParameterBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierTemplateParameterEditHelperAdvice" xmi:id="_uuHFoH67EeSVzvxdAiQ3xA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Clause" identifier="org.eclipse.papyrus.uml.Clause" name="UML::Clause" xmi:id="_Sca001YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Clause.gif" xmi:id="_Sca01FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Clause"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ClearAssociationAction" identifier="org.eclipse.papyrus.uml.ClearAssociationAction" name="UML::ClearAssociationAction" xmi:id="_Sca01VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearAssociationAction.gif" xmi:id="_Sca01lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearAssociationAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ClearStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" name="UML::ClearStructuralFeatureAction" xmi:id="_Sca03VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" xmi:id="_Sca03lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearStructuralFeatureAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ClearVariableAction" identifier="org.eclipse.papyrus.uml.ClearVariableAction" name="UML::ClearVariableAction" xmi:id="_Sca05VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearVariableAction.gif" xmi:id="_Sca05lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearVariableAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CollaborationEditHelper" hint="UML::Collaboration" identifier="org.eclipse.papyrus.uml.Collaboration" name="UML::Collaboration" xmi:id="_Sca07VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif" xmi:id="_Sca07lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Collaboration::CollaborationRole" identifier="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" name="UML::Collaboration::CollaborationRole" xmi:id="_IsX6UMc9EeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElement.gif" xmi:id="_XvNAUMc9EeS1POoqrCEMrQ"/>

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationCollaborationRoleEditHelperAdvice" xmi:id="_8m8kIMc9EeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::CollaborationUse" identifier="org.eclipse.papyrus.uml.CollaborationUse" name="UML::CollaborationUse" xmi:id="_Sca071YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CollaborationUse.gif" xmi:id="_Sca08FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CollaborationUse"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::CombinedFragment" identifier="org.eclipse.papyrus.uml.CombinedFragment" name="UML::CombinedFragment" xmi:id="_Scbb1lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CombinedFragment.gif" xmi:id="_Scbb11YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Comment" identifier="org.eclipse.papyrus.uml.Comment" name="UML::Comment" xmi:id="_Scbb2FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_Scbb2VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Comment::AnnotatedElements" identifier="org.eclipse.papyrus.uml.Comment.AnnotatedElements" name="UML::Comment::AnnotatedElements" xmi:id="_poCSAGqWEeSE-IVtP6jQeA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsEditHelperAdvice" xmi:id="_6-K50HY7EeSaAZaF2vKiqg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CommunicationPathEditHelper" hint="UML::CommunicationPath" identifier="org.eclipse.papyrus.uml.CommunicationPath" name="UML::CommunicationPath" xmi:id="_Scbb2lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CommunicationPath.gif" xmi:id="_Scbb21YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CommunicationPath"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentEditHelper" hint="UML::Component" identifier="org.eclipse.papyrus.uml.Component" name="UML::Component" xmi:id="_Scbb6FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif" xmi:id="_Scbb6VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentRealizationEditHelper" hint="UML::ComponentRealization" identifier="org.eclipse.papyrus.uml.ComponentRealization" name="UML::ComponentRealization" xmi:id="_Scbb6lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif" xmi:id="_Scbb61YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ComponentRealization"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper" hint="UML::ConditionalNode" identifier="org.eclipse.papyrus.uml.ConditionalNode" name="UML::ConditionalNode" xmi:id="_ScbcBFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif" xmi:id="_ScbcBVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConditionalNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectableElement" identifier="org.eclipse.papyrus.uml.ConnectableElement" name="UML::ConnectableElement" xmi:id="_SccC71YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElement.gif" xmi:id="_SccC8FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectableElementTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase" name="UML::ConnectableElementTemplateParameterBase" xmi:id="_SccC8VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" xmi:id="_SccC8lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElementTemplateParameter"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ConnectableElementTemplateParameter" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" name="UML::ConnectableElementTemplateParameter" xmi:id="_yjhpkJXIEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectableElementTemplateParameterEditHelperAdvice" xmi:id="_yjhpkZXIEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectionPointReference" identifier="org.eclipse.papyrus.uml.ConnectionPointReference" name="UML::ConnectionPointReference" xmi:id="_SccC81YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif" xmi:id="_SccC9FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectionPointReference"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConnectorEditHelper" hint="UML::Connector" identifier="org.eclipse.papyrus.uml.Connector" name="UML::Connector" xmi:id="_SccC9VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif" xmi:id="_SccC9lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConnectorEnd" identifier="org.eclipse.papyrus.uml.ConnectorEnd" name="UML::ConnectorEnd" xmi:id="_SccC91YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectorEnd.gif" xmi:id="_SccC-FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectorEnd"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ConsiderIgnoreFragment" identifier="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" name="UML::ConsiderIgnoreFragment" xmi:id="_SccC-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" xmi:id="_SccC-lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConstraintEditHelper" hint="UML::Constraint" identifier="org.eclipse.papyrus.uml.Constraint" name="UML::Constraint" xmi:id="_SccC-1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_SccC_FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Constraint::ConstrainedElements" identifier="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" name="UML::Constraint::ConstrainedElements" xmi:id="_XHjzcGslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsEditHelperAdvice" xmi:id="_njRJoHbmEeSsxehP964iKQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Constraint::Context" identifier="org.eclipse.papyrus.uml.Constraint.Context" name="UML::Constraint::Context" xmi:id="_ax9dwHZLEeSQEpHemLeWnw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextEditHelperAdvice" xmi:id="_rZSY8HbmEeSsxehP964iKQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Continuation" identifier="org.eclipse.papyrus.uml.Continuation" name="UML::Continuation" xmi:id="_SccDFVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Continuation.gif" xmi:id="_SccDFlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ControlFlowEditHelper" hint="UML::ControlFlow" identifier="org.eclipse.papyrus.uml.ControlFlow" name="UML::ControlFlow" xmi:id="_SccDF1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_SccDGFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlFlow"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ControlNode" identifier="org.eclipse.papyrus.uml.ControlNode" name="UML::ControlNode" xmi:id="_SccDGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlNode.gif" xmi:id="_Sccp8FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CreateLinkAction" identifier="org.eclipse.papyrus.uml.CreateLinkAction" name="UML::CreateLinkAction" xmi:id="_Sccp8VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkAction.gif" xmi:id="_Sccp8lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CreateLinkObjectAction" identifier="org.eclipse.papyrus.uml.CreateLinkObjectAction" name="UML::CreateLinkObjectAction" xmi:id="_Sccp-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" xmi:id="_Sccp-lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkObjectAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::CreateObjectAction" identifier="org.eclipse.papyrus.uml.CreateObjectAction" name="UML::CreateObjectAction" xmi:id="_SccqAVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateObjectAction.gif" xmi:id="_SccqAlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateObjectAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DataStoreNode" identifier="org.eclipse.papyrus.uml.DataStoreNode" name="UML::DataStoreNode" xmi:id="_SccqCVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_SccqClYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DataStoreNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DataType" identifier="org.eclipse.papyrus.uml.DataType" name="UML::DataType" xmi:id="_SccqC1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif" xmi:id="_SccqDFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DecisionNode" identifier="org.eclipse.papyrus.uml.DecisionNode" name="UML::DecisionNode" xmi:id="_SccqGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_SccqGlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DecisionNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Dependency" identifier="org.eclipse.papyrus.uml.Dependency" name="UML::Dependency" xmi:id="_SccqG1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_SccqHFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::CollaborationUse::RoleBinding" identifier="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" name="UML::CollaborationUse::RoleBinding" xmi:id="_TFofsLhAEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.papyrus.uml.service.types" iconPath="/icons/CollaborationRoleBinding.gif" xmi:id="_m8FswLhAEeSANYuUIb1qQA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RoleBindingHelperAdvice" xmi:id="_Ao6QQLhBEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DeployedArtifact" identifier="org.eclipse.papyrus.uml.DeployedArtifact" name="UML::DeployedArtifact" xmi:id="_SccqI1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeployedArtifact.gif" xmi:id="_SccqJFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeployedArtifact"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DeploymentEditHelper" hint="UML::Deployment" identifier="org.eclipse.papyrus.uml.Deployment" name="UML::Deployment" xmi:id="_SccqJVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif" xmi:id="_SccqJlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Deployment"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DeploymentSpecification" identifier="org.eclipse.papyrus.uml.DeploymentSpecification" name="UML::DeploymentSpecification" xmi:id="_ScdRAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif" xmi:id="_ScdRAVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DeploymentTarget" identifier="org.eclipse.papyrus.uml.DeploymentTarget" name="UML::DeploymentTarget" xmi:id="_ScdRDlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentTarget.gif" xmi:id="_ScdRD1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DestroyLinkAction" identifier="org.eclipse.papyrus.uml.DestroyLinkAction" name="UML::DestroyLinkAction" xmi:id="_ScdRFlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyLinkAction.gif" xmi:id="_ScdRF1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyLinkAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::DestroyObjectAction" identifier="org.eclipse.papyrus.uml.DestroyObjectAction" name="UML::DestroyObjectAction" xmi:id="_ScdRHlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyObjectAction.gif" xmi:id="_ScdRH1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyObjectAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DestructionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.DestructionOccurrenceSpecification" name="UML::DestructionOccurrenceSpecification" xmi:id="_ScdRJlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" xmi:id="_ScdRJ1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Device" identifier="org.eclipse.papyrus.uml.Device" name="UML::Device" xmi:id="_ScdRKFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif" xmi:id="_ScdRKVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Device"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DirectedRelationship" identifier="org.eclipse.papyrus.uml.DirectedRelationship" name="UML::DirectedRelationship" xmi:id="_Scd4E1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DirectedRelationship.gif" xmi:id="_Scd4FFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Duration" identifier="org.eclipse.papyrus.uml.Duration" name="UML::Duration" xmi:id="_Scd4FVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Duration.gif" xmi:id="_Scd4FlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Duration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DurationConstraintEditHelper" hint="UML::DurationConstraint" identifier="org.eclipse.papyrus.uml.DurationConstraint" name="UML::DurationConstraint" xmi:id="_Scd4F1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif" xmi:id="_Scd4GFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DurationInterval" identifier="org.eclipse.papyrus.uml.DurationInterval" name="UML::DurationInterval" xmi:id="_Scd4MVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationInterval.gif" xmi:id="_Scd4MlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationInterval"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::DurationObservation" identifier="org.eclipse.papyrus.uml.DurationObservation" name="UML::DurationObservation" xmi:id="_ScefSlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif" xmi:id="_ScefS1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Element" identifier="org.eclipse.papyrus.uml.Element" name="UML::Element" xmi:id="_ScgUUFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Element.gif" xmi:id="_ScgUUVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementImportEditHelper" hint="UML::ElementImportBase" identifier="org.eclipse.papyrus.uml.ElementImportBase" name="UML::ElementImportBase" xmi:id="_ScgUUlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_ScgUU1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ElementImport"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::ElementImport" identifier="org.eclipse.papyrus.uml.ElementImport" name="UML::ElementImport" xmi:id="_Dx12sJzPEeSEObywEoz_Cw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif" xmi:id="_H_ygYAOyEeWv4ca2-olBmg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ElementImportBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementImportEditHelperAdvice" xmi:id="_TB2dEJzPEeSEObywEoz_Cw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::EncapsulatedClassifier" identifier="org.eclipse.papyrus.uml.EncapsulatedClassifier" name="UML::EncapsulatedClassifier" xmi:id="_ScgUVFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EncapsulatedClassifier.gif" xmi:id="_ScgUVVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Enumeration" identifier="org.eclipse.papyrus.uml.Enumeration" name="UML::Enumeration" xmi:id="_ScgUVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif" xmi:id="_ScgUV1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::EnumerationLiteral" identifier="org.eclipse.papyrus.uml.EnumerationLiteral" name="UML::EnumerationLiteral" xmi:id="_ScgUWFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif" xmi:id="_ScgUWVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Event" identifier="org.eclipse.papyrus.uml.Event" name="UML::Event" xmi:id="_Scg7ZFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Event.gif" xmi:id="_Scg7ZVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Event"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExceptionHandlerEditHelper" hint="UML::ExceptionHandler" identifier="org.eclipse.papyrus.uml.ExceptionHandler" name="UML::ExceptionHandler" xmi:id="_Scg7ZlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExceptionHandler.gif" xmi:id="_Scg7Z1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExceptionHandler"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ExecutableNode" identifier="org.eclipse.papyrus.uml.ExecutableNode" name="UML::ExecutableNode" xmi:id="_Scg7aFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutableNode.gif" xmi:id="_Scg7aVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutableNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExecutionEnvironment" identifier="org.eclipse.papyrus.uml.ExecutionEnvironment" name="UML::ExecutionEnvironment" xmi:id="_Scg7alYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" xmi:id="_Scg7a1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionEnvironment"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExecutionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" name="UML::ExecutionOccurrenceSpecification" xmi:id="_SchicVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" xmi:id="_SchiclYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionOccurrenceSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExecutionSpecification" identifier="org.eclipse.papyrus.uml.ExecutionSpecification" name="UML::ExecutionSpecification" xmi:id="_Schic1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionSpecification.gif" xmi:id="_SchidFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionNodeHelper" hint="UML::ExpansionNode" identifier="org.eclipse.papyrus.uml.ExpansionNode" name="UML::ExpansionNode" xmi:id="_SchidVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif" xmi:id="_SchidlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionRegionHelper" hint="UML::ExpansionRegion" identifier="org.eclipse.papyrus.uml.ExpansionRegion" name="UML::ExpansionRegion" xmi:id="_Schid1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_SchieFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Expression" identifier="org.eclipse.papyrus.uml.Expression" name="UML::Expression" xmi:id="_SchiiFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Expression.gif" xmi:id="_SchiiVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Expression"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtendEditHelper" hint="UML::ExtendBase" identifier="org.eclipse.papyrus.uml.ExtendBase" name="UML::ExtendBase" xmi:id="_SciwrFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif" xmi:id="_ScjXoFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Extend"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Extend" identifier="org.eclipse.papyrus.uml.Extend" name="UML::Extend" xmi:id="_kV8SgFrNEeSNSq3G9Z6fKQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif" xmi:id="_t3ycMFrNEeSNSq3G9Z6fKQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExtendBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExtendEditHelperAdvice" xmi:id="_8QiDYFrNEeSNSq3G9Z6fKQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtensionEditHelper" hint="UML::Extension" identifier="org.eclipse.papyrus.uml.Extension" name="UML::Extension" xmi:id="_ScjXoVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif" xmi:id="_ScjXolYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Extension"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExtensionEnd" identifier="org.eclipse.papyrus.uml.ExtensionEnd" name="UML::ExtensionEnd" xmi:id="_ScjXo1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionEnd.gif" xmi:id="_ScjXpFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionEnd"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ExtensionPoint" identifier="org.eclipse.papyrus.uml.ExtensionPoint" name="UML::ExtensionPoint" xmi:id="_ScjXq1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_ScjXrFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionPoint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Feature" identifier="org.eclipse.papyrus.uml.Feature" name="UML::Feature" xmi:id="_ScjXuVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Feature.gif" xmi:id="_ScjXulYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::FinalNode" identifier="org.eclipse.papyrus.uml.FinalNode" name="UML::FinalNode" xmi:id="_Scj-sFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalNode.gif" xmi:id="_Scj-sVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::FinalState" identifier="org.eclipse.papyrus.uml.FinalState" name="UML::FinalState" xmi:id="_Scj-slYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif" xmi:id="_ScklwFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalState"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::FlowFinalNode" identifier="org.eclipse.papyrus.uml.FlowFinalNode" name="UML::FlowFinalNode" xmi:id="_ScklwVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_ScklwlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FlowFinalNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ForkNode" identifier="org.eclipse.papyrus.uml.ForkNode" name="UML::ForkNode" xmi:id="_Scklw1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_ScklxFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ForkNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::FunctionBehavior" identifier="org.eclipse.papyrus.uml.FunctionBehavior" name="UML::FunctionBehavior" xmi:id="_ScklxVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif" xmi:id="_ScklxlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FunctionBehavior"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Gate" identifier="org.eclipse.papyrus.uml.Gate" name="UML::Gate" xmi:id="_Sclz6lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Gate.gif" xmi:id="_Sclz61YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Gate"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::GeneralOrdering" identifier="org.eclipse.papyrus.uml.GeneralOrdering" name="UML::GeneralOrdering" xmi:id="_Sclz7FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralOrdering.gif" xmi:id="_Sclz7VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper" hint="UML::Generalization" identifier="org.eclipse.papyrus.uml.Generalization" name="UML::Generalization" xmi:id="_Scma8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif" xmi:id="_Scma8VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationSetEditHelper" hint="UML::GeneralizationSet" identifier="org.eclipse.papyrus.uml.GeneralizationSet" name="UML::GeneralizationSet" xmi:id="_ScnCAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralizationSet.gif" xmi:id="_ScnCAVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralizationSet"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Image" identifier="org.eclipse.papyrus.uml.Image" name="UML::Image" xmi:id="_ScnCCFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Image.gif" xmi:id="_ScnCCVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Image"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IncludeEditHelper" hint="UML::Include" identifier="org.eclipse.papyrus.uml.Include" name="UML::Include" xmi:id="_ScnCClYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Include.gif" xmi:id="_ScnCC1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Include"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InformationFlowEditHelper" hint="UML::InformationFlowBase" identifier="org.eclipse.papyrus.uml.InformationFlowBase" name="UML::InformationFlowBase" xmi:id="_ScnCDFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_ScnCDVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationFlow"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InformationFlow" identifier="org.eclipse.papyrus.uml.InformationFlow" name="UML::InformationFlow" xmi:id="_ZLpUILgeEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif" xmi:id="_jt-DYLgeEeSANYuUIb1qQA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.InformationFlowBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InformationFlowEditHelperAdvice" xmi:id="_lfPMsLgeEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InformationItem" identifier="org.eclipse.papyrus.uml.InformationItem" name="UML::InformationItem" xmi:id="_ScnCFFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif" xmi:id="_ScnCFVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationItem"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::InitialNode" identifier="org.eclipse.papyrus.uml.InitialNode" name="UML::InitialNode" xmi:id="_Sco3OVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_Sco3OlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InitialNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::InputPin" identifier="org.eclipse.papyrus.uml.InputPin" name="UML::InputPin" xmi:id="_Sco3O1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_Sco3PFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InstanceSpecificationEditHelper" hint="UML::InstanceSpecification" identifier="org.eclipse.papyrus.uml.InstanceSpecification" name="UML::InstanceSpecification" xmi:id="_Scr6iVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif" xmi:id="_Scr6ilYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::InstanceSpecification::Link" identifier="org.eclipse.papyrus.uml.InstanceSpecification.Link" name="UML::InstanceSpecification::Link" xmi:id="_bvHrYJXNEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InstanceSpecificationEditHelperAdvice" xmi:id="_bvHrYZXNEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InstanceValue" identifier="org.eclipse.papyrus.uml.InstanceValue" name="UML::InstanceValue" xmi:id="_Scr6kVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceValue.gif" xmi:id="_Scr6klYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceValue"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Interaction" identifier="org.eclipse.papyrus.uml.Interaction" name="UML::Interaction" xmi:id="_SctIsVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif" xmi:id="_SctIslYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionConstraint" identifier="org.eclipse.papyrus.uml.InteractionConstraint" name="UML::InteractionConstraint" xmi:id="_SctIs1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionConstraint.gif" xmi:id="_SctItFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionConstraint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionFragment" identifier="org.eclipse.papyrus.uml.InteractionFragment" name="UML::InteractionFragment" xmi:id="_SctvwlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionFragment.gif" xmi:id="_Sctvw1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionFragment"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionOperand" identifier="org.eclipse.papyrus.uml.InteractionOperand" name="UML::InteractionOperand" xmi:id="_SctvxFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionOperand.gif" xmi:id="_SctvxVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::InteractionUse" identifier="org.eclipse.papyrus.uml.InteractionUse" name="UML::InteractionUse" xmi:id="_SctvxlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionUse.gif" xmi:id="_Sctvx1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Interface" identifier="org.eclipse.papyrus.uml.Interface" name="UML::Interface" xmi:id="_ScuW2VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_ScuW2lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper" hint="UML::InterfaceRealization" identifier="org.eclipse.papyrus.uml.InterfaceRealization" name="UML::InterfaceRealization" xmi:id="_ScuW21YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif" xmi:id="_Scvk4FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterruptibleActivityRegionHelper" hint="UML::InterruptibleActivityRegion" identifier="org.eclipse.papyrus.uml.InterruptibleActivityRegion" name="UML::InterruptibleActivityRegion" xmi:id="_ScwL-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_ScwL-lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InterruptibleActivityRegion"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Interval" identifier="org.eclipse.papyrus.uml.Interval" name="UML::Interval" xmi:id="_ScwL-1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interval.gif" xmi:id="_ScwL_FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interval"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IntervalConstraintEditHelper" hint="UML::IntervalConstraint" identifier="org.eclipse.papyrus.uml.IntervalConstraint" name="UML::IntervalConstraint" xmi:id="_ScxaEFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif" xmi:id="_ScxaEVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//IntervalConstraint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::InvocationAction" identifier="org.eclipse.papyrus.uml.InvocationAction" name="UML::InvocationAction" xmi:id="_Scz2U1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InvocationAction.gif" xmi:id="_Scz2VFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InvocationAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::JoinNode" identifier="org.eclipse.papyrus.uml.JoinNode" name="UML::JoinNode" xmi:id="_Scz2VVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_Scz2VlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//JoinNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Lifeline" identifier="org.eclipse.papyrus.uml.Lifeline" name="UML::Lifeline" xmi:id="_Scz2V1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Lifeline.gif" xmi:id="_Scz2WFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::LinkAction" identifier="org.eclipse.papyrus.uml.LinkAction" name="UML::LinkAction" xmi:id="_Scz2WVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkAction.gif" xmi:id="_Scz2WlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LinkEndCreationData" identifier="org.eclipse.papyrus.uml.LinkEndCreationData" name="UML::LinkEndCreationData" xmi:id="_Scz2W1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkEndCreationData.gif" xmi:id="_Scz2XFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndCreationData"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LinkEndData" identifier="org.eclipse.papyrus.uml.LinkEndData" name="UML::LinkEndData" xmi:id="_Scz2XVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkEndData.gif" xmi:id="_Scz2XlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndData"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LinkEndDestructionData" identifier="org.eclipse.papyrus.uml.LinkEndDestructionData" name="UML::LinkEndDestructionData" xmi:id="_Scz2X1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LinkEndDestructionData.gif" xmi:id="_Scz2YFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndDestructionData"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralBoolean" identifier="org.eclipse.papyrus.uml.LiteralBoolean" name="UML::LiteralBoolean" xmi:id="_Scz2YVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralBoolean.gif" xmi:id="_Scz2YlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralBoolean"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.LiteralIntegerEditHelper" hint="UML::LiteralInteger" identifier="org.eclipse.papyrus.uml.LiteralInteger" name="UML::LiteralInteger" xmi:id="_Sc1EflYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralInteger.gif" xmi:id="_Sc1Ef1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralNull" identifier="org.eclipse.papyrus.uml.LiteralNull" name="UML::LiteralNull" xmi:id="_Sc2Sk1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralNull.gif" xmi:id="_Sc2SlFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralNull"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralReal" identifier="org.eclipse.papyrus.uml.LiteralReal" name="UML::LiteralReal" xmi:id="_Sc25v1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralReal.gif" xmi:id="_Sc25wFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralReal"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralSpecification" identifier="org.eclipse.papyrus.uml.LiteralSpecification" name="UML::LiteralSpecification" xmi:id="_Sc4HxlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralSpecification.gif" xmi:id="_Sc4Hx1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralString" identifier="org.eclipse.papyrus.uml.LiteralString" name="UML::LiteralString" xmi:id="_Sc4HyFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralString.gif" xmi:id="_Sc4HyVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralString"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::LiteralUnlimitedNatural" identifier="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" name="UML::LiteralUnlimitedNatural" xmi:id="_Sc4u7FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" xmi:id="_Sc4u7VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralUnlimitedNatural"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper" hint="UML::LoopNode" identifier="org.eclipse.papyrus.uml.LoopNode" name="UML::LoopNode" xmi:id="_Sc58-VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_Sc58-lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ManifestationEditHelper" hint="UML::Manifestation" identifier="org.eclipse.papyrus.uml.Manifestation" name="UML::Manifestation" xmi:id="_Sc59ClYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif" xmi:id="_Sc59C1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Manifestation"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::MergeNode" identifier="org.eclipse.papyrus.uml.MergeNode" name="UML::MergeNode" xmi:id="_Sc59ElYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_Sc59E1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MergeNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper" hint="UML::Message" identifier="org.eclipse.papyrus.uml.Message" name="UML::Message" xmi:id="_Sc59FFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message.gif" xmi:id="_Sc59FVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MessageEnd" identifier="org.eclipse.papyrus.uml.MessageEnd" name="UML::MessageEnd" xmi:id="_Sc59FlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MessageEnd.gif" xmi:id="_Sc59F1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEnd"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MessageEvent" identifier="org.eclipse.papyrus.uml.MessageEvent" name="UML::MessageEvent" xmi:id="_Sc59GFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MessageEvent.gif" xmi:id="_Sc59GVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEvent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MessageOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" name="UML::MessageOccurrenceSpecification" xmi:id="_Sc6kAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" xmi:id="_Sc6kAVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageOccurrenceSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Model" identifier="org.eclipse.papyrus.uml.Model" name="UML::Model" xmi:id="_Sc6kAlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif" xmi:id="_Sc6kA1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Model"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::MultiplicityElement" identifier="org.eclipse.papyrus.uml.MultiplicityElement" name="UML::MultiplicityElement" xmi:id="_Sc6kClYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MultiplicityElement.gif" xmi:id="_Sc6kC1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::NamedElement" identifier="org.eclipse.papyrus.uml.NamedElement" name="UML::NamedElement" xmi:id="_Sc6kDFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/NamedElement.gif" xmi:id="_Sc6kDVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Namespace" identifier="org.eclipse.papyrus.uml.Namespace" name="UML::Namespace" xmi:id="_Sc6kDlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Namespace.gif" xmi:id="_Sc6kD1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Node" identifier="org.eclipse.papyrus.uml.Node" name="UML::Node" xmi:id="_Sc6kEFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif" xmi:id="_Sc6kEVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Node"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObjectFlowEditHelper" hint="UML::ObjectFlow" identifier="org.eclipse.papyrus.uml.ObjectFlow" name="UML::ObjectFlow" xmi:id="_Sc6kJFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_Sc6kJVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectFlow"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ObjectNode" identifier="org.eclipse.papyrus.uml.ObjectNode" name="UML::ObjectNode" xmi:id="_Sc6kJlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectNode.gif" xmi:id="_Sc6kJ1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Observation" identifier="org.eclipse.papyrus.uml.Observation" name="UML::Observation" xmi:id="_Sc6kKFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Observation.gif" xmi:id="_Sc6kKVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Observation"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OccurrenceSpecification" identifier="org.eclipse.papyrus.uml.OccurrenceSpecification" name="UML::OccurrenceSpecification" xmi:id="_Sc6kKlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" xmi:id="_Sc7LEFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OccurrenceSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::OpaqueAction" identifier="org.eclipse.papyrus.uml.OpaqueAction" name="UML::OpaqueAction" xmi:id="_Sc7LEVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_Sc7LElYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OpaqueBehavior" identifier="org.eclipse.papyrus.uml.OpaqueBehavior" name="UML::OpaqueBehavior" xmi:id="_Sc7LGVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif" xmi:id="_Sc7LGlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OpaqueExpression" identifier="org.eclipse.papyrus.uml.OpaqueExpression" name="UML::OpaqueExpression" xmi:id="_Sc7yIVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueExpression.gif" xmi:id="_Sc7yIlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueExpression"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Operation" identifier="org.eclipse.papyrus.uml.Operation" name="UML::Operation" xmi:id="_Sc8ZVFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_Sc8ZVVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::OperationTemplateParameterBase" identifier="org.eclipse.papyrus.uml.OperationTemplateParameterBase" name="UML::OperationTemplateParameterBase" xmi:id="_Sc8ZVlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" xmi:id="_Sc8ZV1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OperationTemplateParameter"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::OperationTemplateParameter" identifier="org.eclipse.papyrus.uml.OperationTemplateParameter" name="UML::OperationTemplateParameter" xmi:id="_vg_QMJXJEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.OperationTemplateParameterBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OperationTemplateParameterEditHelperAdvice" xmi:id="_vg_QMZXJEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::OutputPin" identifier="org.eclipse.papyrus.uml.OutputPin" name="UML::OutputPin" xmi:id="_Sc9AQ1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_Sc9ARFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Package" identifier="org.eclipse.papyrus.uml.Package" name="UML::Package" xmi:id="_Sc9nZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_Sc9nZlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageImportEditHelper" hint="UML::PackageImportBase" identifier="org.eclipse.papyrus.uml.PackageImportBase" name="UML::PackageImportBase" xmi:id="_Sc9nZ1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_Sc9naFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageImport"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageImport" identifier="org.eclipse.papyrus.uml.PackageImport" name="UML::PackageImport" xmi:id="_8kkk8GN5EeSrwvaW5Is9PQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif" xmi:id="_WI3T4AOyEeWv4ca2-olBmg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageImportBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageImportEditHelperAdvice" xmi:id="_LSLo4GN6EeSrwvaW5Is9PQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageMergeEditHelper" hint="UML::PackageMergeBase" identifier="org.eclipse.papyrus.uml.PackageMergeBase" name="UML::PackageMergeBase" xmi:id="_Sc9naVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_Sc9nalYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageMerge"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PackageMerge" identifier="org.eclipse.papyrus.uml.PackageMerge" name="UML::PackageMerge" xmi:id="_5VbKkGOIEeSw8rz5ZQEURQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif" xmi:id="_697XIAOyEeWv4ca2-olBmg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.PackageMergeBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageMergeEditHelperAdvice" xmi:id="_EJxd8GOJEeSw8rz5ZQEURQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::PackageableElement" identifier="org.eclipse.papyrus.uml.PackageableElement" name="UML::PackageableElement" xmi:id="_Sc9ncVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageableElement.gif" xmi:id="_Sc9nclYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageableElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Parameter" identifier="org.eclipse.papyrus.uml.Parameter" name="UML::Parameter" xmi:id="_Sc9nc1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_Sc9ndFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ParameterSet" identifier="org.eclipse.papyrus.uml.ParameterSet" name="UML::ParameterSet" xmi:id="_Sc9ndVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterSet.gif" xmi:id="_Sc9ndlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterSet"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ParameterableElement" identifier="org.eclipse.papyrus.uml.ParameterableElement" name="UML::ParameterableElement" xmi:id="_Sc-OZlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ParameterableElement.gif" xmi:id="_Sc-OZ1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::PartDecomposition" identifier="org.eclipse.papyrus.uml.PartDecomposition" name="UML::PartDecomposition" xmi:id="_Sc-OaFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PartDecomposition.gif" xmi:id="_Sc-OaVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PartDecomposition"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::Pin" identifier="org.eclipse.papyrus.uml.Pin" name="UML::Pin" xmi:id="_Sc-OalYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pin.gif" xmi:id="_Sc-Oa1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Pin"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper" hint="UML::Port" identifier="org.eclipse.papyrus.uml.Port" name="UML::Port" xmi:id="_Sc-ObFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif" xmi:id="_Sc-ObVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::PrimitiveType" identifier="org.eclipse.papyrus.uml.PrimitiveType" name="UML::PrimitiveType" xmi:id="_Sc-OdFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif" xmi:id="_Sc-OdVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Profile" identifier="org.eclipse.papyrus.uml.Profile" name="UML::Profile" xmi:id="_Sc-OglYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif" xmi:id="_Sc-Og1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ProfileApplication" identifier="org.eclipse.papyrus.uml.ProfileApplication" name="UML::ProfileApplication" xmi:id="_Sc-OhFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif" xmi:id="_Sc-OhVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProfileApplication"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Property" identifier="org.eclipse.papyrus.uml.Property" name="UML::Property" xmi:id="_Sc-1cFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_Sc-1cVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::PropertyPart" identifier="org.eclipse.papyrus.uml.PropertyPart" name="UML::PropertyPart" xmi:id="_wdkpELhLEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif" xmi:id="_5SIO8LhLEeSANYuUIb1qQA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyPartHelperAdvice" xmi:id="_509PMLhLEeSANYuUIb1qQA" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolConformanceEditHelper" hint="UML::ProtocolConformance" identifier="org.eclipse.papyrus.uml.ProtocolConformance" name="UML::ProtocolConformance" xmi:id="_Sc-1eFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolConformance.gif" xmi:id="_Sc-1eVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolConformance"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolStateMachineEditHelper" hint="UML::ProtocolStateMachine" identifier="org.eclipse.papyrus.uml.ProtocolStateMachine" name="UML::ProtocolStateMachine" xmi:id="_Sc-1elYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" xmi:id="_Sc-1e1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolStateMachine"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ProtocolTransition" identifier="org.eclipse.papyrus.uml.ProtocolTransition" name="UML::ProtocolTransition" xmi:id="_Sc-1oFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolTransition.gif" xmi:id="_Sc_cgFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolTransition"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Pseudostate" identifier="org.eclipse.papyrus.uml.Pseudostate" name="UML::Pseudostate" xmi:id="_Sc_cgVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate.gif" xmi:id="_Sc_cglYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::QualifierValue" identifier="org.eclipse.papyrus.uml.QualifierValue" name="UML::QualifierValue" xmi:id="_Sc_cg1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/QualifierValue.gif" xmi:id="_Sc_chFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//QualifierValue"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::RaiseExceptionAction" identifier="org.eclipse.papyrus.uml.RaiseExceptionAction" name="UML::RaiseExceptionAction" xmi:id="_Sc_chVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RaiseExceptionAction.gif" xmi:id="_Sc_chlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RaiseExceptionAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadExtentAction" identifier="org.eclipse.papyrus.uml.ReadExtentAction" name="UML::ReadExtentAction" xmi:id="_Sc_cjVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadExtentAction.gif" xmi:id="_Sc_cjlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadExtentAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadIsClassifiedObjectAction" identifier="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" name="UML::ReadIsClassifiedObjectAction" xmi:id="_Sc_clVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" xmi:id="_Sc_cllYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadIsClassifiedObjectAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadLinkAction" identifier="org.eclipse.papyrus.uml.ReadLinkAction" name="UML::ReadLinkAction" xmi:id="_Sc_cnVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkAction.gif" xmi:id="_Sc_cnlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadLinkObjectEndAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" name="UML::ReadLinkObjectEndAction" xmi:id="_Sc_cpVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkObjectEndAction.gif" xmi:id="_Sc_cplYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadLinkObjectEndQualifierAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" name="UML::ReadLinkObjectEndQualifierAction" xmi:id="_Sc_crVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" xmi:id="_Sc_crlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndQualifierAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadSelfAction" identifier="org.eclipse.papyrus.uml.ReadSelfAction" name="UML::ReadSelfAction" xmi:id="_SdADk1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadSelfAction.gif" xmi:id="_SdADlFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadSelfAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" name="UML::ReadStructuralFeatureAction" xmi:id="_SdADm1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" xmi:id="_SdADnFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadStructuralFeatureAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReadVariableAction" identifier="org.eclipse.papyrus.uml.ReadVariableAction" name="UML::ReadVariableAction" xmi:id="_SdADo1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadVariableAction.gif" xmi:id="_SdADpFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadVariableAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Realization" identifier="org.eclipse.papyrus.uml.Realization" name="UML::Realization" xmi:id="_SdADq1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif" xmi:id="_SdADrFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Realization"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Reception" identifier="org.eclipse.papyrus.uml.Reception" name="UML::Reception" xmi:id="_SdADs1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif" xmi:id="_SdADtFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Reception"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReclassifyObjectAction" identifier="org.eclipse.papyrus.uml.ReclassifyObjectAction" name="UML::ReclassifyObjectAction" xmi:id="_SdAqoFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" xmi:id="_SdAqoVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReclassifyObjectAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::RedefinableElement" identifier="org.eclipse.papyrus.uml.RedefinableElement" name="UML::RedefinableElement" xmi:id="_SdAqqFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableElement.gif" xmi:id="_SdAqqVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::RedefinableTemplateSignature" identifier="org.eclipse.papyrus.uml.RedefinableTemplateSignature" name="UML::RedefinableTemplateSignature" xmi:id="_SdAqqlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" xmi:id="_SdAqq1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableTemplateSignature"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReduceAction" identifier="org.eclipse.papyrus.uml.ReduceAction" name="UML::ReduceAction" xmi:id="_SdAqrFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReduceAction.gif" xmi:id="_SdAqrVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReduceAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.RegionEditHelper" hint="UML::Region" identifier="org.eclipse.papyrus.uml.Region" name="UML::Region" xmi:id="_SdBRtlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif" xmi:id="_SdBRt1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Relationship" identifier="org.eclipse.papyrus.uml.Relationship" name="UML::Relationship" xmi:id="_SdBRuFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Relationship.gif" xmi:id="_SdBRuVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::RemoveStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" name="UML::RemoveStructuralFeatureValueAction" xmi:id="_SdBRulYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" xmi:id="_SdBRu1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveStructuralFeatureValueAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::RemoveVariableValueAction" identifier="org.eclipse.papyrus.uml.RemoveVariableValueAction" name="UML::RemoveVariableValueAction" xmi:id="_SdBRwlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RemoveVariableValueAction.gif" xmi:id="_SdBRw1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveVariableValueAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ReplyAction" identifier="org.eclipse.papyrus.uml.ReplyAction" name="UML::ReplyAction" xmi:id="_SdBRylYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReplyAction.gif" xmi:id="_SdBRy1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReplyAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::SendObjectAction" identifier="org.eclipse.papyrus.uml.SendObjectAction" name="UML::SendObjectAction" xmi:id="_SdBR0lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_SdBR01YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::SendSignalAction" identifier="org.eclipse.papyrus.uml.SendSignalAction" name="UML::SendSignalAction" xmi:id="_SdB4xlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendSignalAction.gif" xmi:id="_SdB4x1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SequenceNodeHelper" hint="UML::SequenceNode" identifier="org.eclipse.papyrus.uml.SequenceNode" name="UML::SequenceNode" xmi:id="_SdB4zlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif" xmi:id="_SdB4z1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SequenceNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Signal" identifier="org.eclipse.papyrus.uml.Signal" name="UML::Signal" xmi:id="_SdB431YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif" xmi:id="_SdB44FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::SignalEvent" identifier="org.eclipse.papyrus.uml.SignalEvent" name="UML::SignalEvent" xmi:id="_SdB44VYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SignalEvent.gif" xmi:id="_SdB44lYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Slot" identifier="org.eclipse.papyrus.uml.Slot" name="UML::Slot" xmi:id="_SdCf4lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif" xmi:id="_SdCf41YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Slot"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::StartClassifierBehaviorAction" identifier="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" name="UML::StartClassifierBehaviorAction" xmi:id="_SdCf5FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" xmi:id="_SdCf5VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StartClassifierBehaviorAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::StartObjectBehaviorAction" identifier="org.eclipse.papyrus.uml.StartObjectBehaviorAction" name="UML::StartObjectBehaviorAction" xmi:id="_SdCf7FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" xmi:id="_SdCf7VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::State" identifier="org.eclipse.papyrus.uml.State" name="UML::State" xmi:id="_SdCf9FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif" xmi:id="_SdCf9VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StateInvariant" identifier="org.eclipse.papyrus.uml.StateInvariant" name="UML::StateInvariant" xmi:id="_SdCf9lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateInvariant.gif" xmi:id="_SdCf91YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StateMachine" identifier="org.eclipse.papyrus.uml.StateMachine" name="UML::StateMachine" xmi:id="_SdCf-FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif" xmi:id="_SdCf-VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Stereotype" identifier="org.eclipse.papyrus.uml.Stereotype" name="UML::Stereotype" xmi:id="_SdDG91YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif" xmi:id="_SdDG-FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StringExpression" identifier="org.eclipse.papyrus.uml.StringExpression" name="UML::StringExpression" xmi:id="_SdDHBVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif" xmi:id="_SdDHBlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StringExpression"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StructuralFeature" identifier="org.eclipse.papyrus.uml.StructuralFeature" name="UML::StructuralFeature" xmi:id="_SdGKSFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuralFeature.gif" xmi:id="_SdGKSVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeature"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::StructuralFeatureAction" identifier="org.eclipse.papyrus.uml.StructuralFeatureAction" name="UML::StructuralFeatureAction" xmi:id="_SdGKSlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuralFeatureAction.gif" xmi:id="_SdGKS1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeatureAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper" hint="UML::StructuredActivityNode" identifier="org.eclipse.papyrus.uml.StructuredActivityNode" name="UML::StructuredActivityNode" xmi:id="_SdGxQFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_SdGxQVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredActivityNode"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::StructuredClassifier" identifier="org.eclipse.papyrus.uml.StructuredClassifier" name="UML::StructuredClassifier" xmi:id="_SdGxUVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredClassifier.gif" xmi:id="_SdGxUlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SubstitutionEditHelper" hint="UML::Substitution" identifier="org.eclipse.papyrus.uml.Substitution" name="UML::Substitution" xmi:id="_SdGxU1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif" xmi:id="_SdGxVFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Substitution"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TemplateBindingEditHelper" hint="UML::TemplateBinding" identifier="org.eclipse.papyrus.uml.TemplateBinding" name="UML::TemplateBinding" xmi:id="_SdHYW1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateBinding.gif" xmi:id="_SdHYXFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateParameterBase" identifier="org.eclipse.papyrus.uml.TemplateParameterBase" name="UML::TemplateParameterBase" xmi:id="_SdHYXVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameter.gif" xmi:id="_SdHYXlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::TemplateParameter" identifier="org.eclipse.papyrus.uml.TemplateParameter" name="UML::TemplateParameter" xmi:id="_JCgQsJXMEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.TemplateParameterBase</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateParameterEditHelperAdvice" xmi:id="_JCgQsZXMEeSmV5hdT3HeBw" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateParameterSubstitution" identifier="org.eclipse.papyrus.uml.TemplateParameterSubstitution" name="UML::TemplateParameterSubstitution" xmi:id="_SdHYX1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameterSubstitution.gif" xmi:id="_SdHYYFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateSignature" identifier="org.eclipse.papyrus.uml.TemplateSignature" name="UML::TemplateSignature" xmi:id="_SdHYYVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateSignature.gif" xmi:id="_SdHYYlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateSignature"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TemplateableElement" identifier="org.eclipse.papyrus.uml.TemplateableElement" name="UML::TemplateableElement" xmi:id="_SdHYY1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateableElement.gif" xmi:id="_SdHYZFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::TestIdentityAction" identifier="org.eclipse.papyrus.uml.TestIdentityAction" name="UML::TestIdentityAction" xmi:id="_SdHYZVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TestIdentityAction.gif" xmi:id="_SdHYZlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TimeConstraintEditHelper" hint="UML::TimeConstraint" identifier="org.eclipse.papyrus.uml.TimeConstraint" name="UML::TimeConstraint" xmi:id="_SdHYbVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif" xmi:id="_SdHYblYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeEvent" identifier="org.eclipse.papyrus.uml.TimeEvent" name="UML::TimeEvent" xmi:id="_SdH_eFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeEvent.gif" xmi:id="_SdH_eVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeEvent"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeExpression" identifier="org.eclipse.papyrus.uml.TimeExpression" name="UML::TimeExpression" xmi:id="_SdImcFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeExpression.gif" xmi:id="_SdImcVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeExpression"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeInterval" identifier="org.eclipse.papyrus.uml.TimeInterval" name="UML::TimeInterval" xmi:id="_SdJNklYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeInterval.gif" xmi:id="_SdJNk1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeInterval"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TimeObservation" identifier="org.eclipse.papyrus.uml.TimeObservation" name="UML::TimeObservation" xmi:id="_SdKbvlYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif" xmi:id="_SdKbv1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TransitionEditHelper" hint="UML::Transition" identifier="org.eclipse.papyrus.uml.Transition" name="UML::Transition" xmi:id="_SdLCtVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition.gif" xmi:id="_SdLCtlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Transition"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Trigger" identifier="org.eclipse.papyrus.uml.Trigger" name="UML::Trigger" xmi:id="_SdLCt1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Trigger.gif" xmi:id="_SdLCuFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Trigger"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Type" identifier="org.eclipse.papyrus.uml.Type" name="UML::Type" xmi:id="_SdLCuVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Type.gif" xmi:id="_SdLCulYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::TypedElement" identifier="org.eclipse.papyrus.uml.TypedElement" name="UML::TypedElement" xmi:id="_SdLCu1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TypedElement.gif" xmi:id="_SdLCvFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::UnmarshallAction" identifier="org.eclipse.papyrus.uml.UnmarshallAction" name="UML::UnmarshallAction" xmi:id="_SdLCvVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UnmarshallAction.gif" xmi:id="_SdLCvlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//UnmarshallAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper" hint="UML::Usage" identifier="org.eclipse.papyrus.uml.Usage" name="UML::Usage" xmi:id="_SdLCxVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif" xmi:id="_SdLCxlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Usage"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.UseCaseEditHelper" hint="UML::UseCase" identifier="org.eclipse.papyrus.uml.UseCase" name="UML::UseCase" xmi:id="_SdLCzVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_SdLCzlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ValuePin" identifier="org.eclipse.papyrus.uml.ValuePin" name="UML::ValuePin" xmi:id="_SdLp11YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif" xmi:id="_SdLp2FYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValuePin"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::ValueSpecification" identifier="org.eclipse.papyrus.uml.ValueSpecification" name="UML::ValueSpecification" xmi:id="_SdM3_1YCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecification.gif" xmi:id="_SdM4AFYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::ValueSpecificationAction" identifier="org.eclipse.papyrus.uml.ValueSpecificationAction" name="UML::ValueSpecificationAction" xmi:id="_SdM4AVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" xmi:id="_SdM4AlYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecificationAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Variable" identifier="org.eclipse.papyrus.uml.Variable" name="UML::Variable" xmi:id="_SdNe8FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Variable.gif" xmi:id="_SdNe8VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Variable"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::VariableAction" identifier="org.eclipse.papyrus.uml.VariableAction" name="UML::VariableAction" xmi:id="_SdNe8lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/VariableAction.gif" xmi:id="_SdNe81YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//VariableAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper" hint="UML::Vertex" identifier="org.eclipse.papyrus.uml.Vertex" name="UML::Vertex" xmi:id="_SdNe-lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Vertex.gif" xmi:id="_SdNe-1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Vertex"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::WriteLinkAction" identifier="org.eclipse.papyrus.uml.WriteLinkAction" name="UML::WriteLinkAction" xmi:id="_SdNe_FYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/WriteLinkAction.gif" xmi:id="_SdNe_VYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteLinkAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::WriteStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" name="UML::WriteStructuralFeatureAction" xmi:id="_SdNe_lYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/WriteStructuralFeatureAction.gif" xmi:id="_SdNe_1YCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper" hint="UML::WriteVariableAction" identifier="org.eclipse.papyrus.uml.WriteVariableAction" name="UML::WriteVariableAction" xmi:id="_SdNfAFYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/WriteVariableAction.gif" xmi:id="_SdNfAVYCEeS0WsAAtVmToA"/>

+    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteVariableAction"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Trace" identifier="org.eclipse.papyrus.uml.Trace" name="UML::Trace" xmi:id="_JPmakGskEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_QcxB0AO0EeWv4ca2-olBmg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TraceEditHelperAdvice" xmi:id="_JPmakWskEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.TraceMatcher" xmi:id="_LDOUUGskEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Refine" identifier="org.eclipse.papyrus.uml.Refine" name="UML::Refine" xmi:id="_UGdZ8GslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif" xmi:id="_N0U_8AO0EeWv4ca2-olBmg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Abstraction</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RefineEditHelperAdvice" xmi:id="_UGdZ8WslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+    <matcherConfiguration matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.RefineMatcher" xmi:id="_UGdZ8mslEeSELtwF_9-6fg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Created to support the ContainmentLink" hint="UML::Element::OwnedElement" identifier="org.eclipse.papyrus.uml.Element.OwnedElement" name="UML::Element::OwnedElement" xmi:id="_xVU0MHlEEeSDaJF_npeEXw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.gmf.runtime.emf.type.core.null</specializedTypesID>

+    <editHelperAdviceConfiguration editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementEditHelperAdvice" xmi:id="_JdUX4MHTEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Containment" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConstraintConstrainedElementsReorient" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA" xmi:id="_6AWx0MJaEeSl6M4_Zhyt7Q" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.CommentAnnotatedElementsReorient" inheritance="all" target="_Scbb2FYCEeS0WsAAtVmToA" xmi:id="_Biw5sMdFEeS1POoqrCEMrQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextReorientEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextReorient" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA" xmi:id="_UdTKsMJbEeSl6M4_Zhyt7Q" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations description="" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" inheritance="all" target="_SccC-1YCEeS0WsAAtVmToA" xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Classifier" inheritance="all" target="_Sca0z1YCEeS0WsAAtVmToA" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Collaboration" target="_Sca07VYCEeS0WsAAtVmToA" xmi:id="_R_pDcmT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.CollaborationUse" target="_Sca071YCEeS0WsAAtVmToA" xmi:id="_R_pDc2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Connector" inheritance="all" target="_SccC9VYCEeS0WsAAtVmToA" xmi:id="_R_pDdGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ConnectorEnd" target="_SccC91YCEeS0WsAAtVmToA" xmi:id="_R_pDdWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.EncapsulatedClassifierHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.EncapsulatedClassifier" inheritance="all" target="_ScgUVFYCEeS0WsAAtVmToA" xmi:id="_R_pqgGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ExecutionSpecification" inheritance="all" target="_Schic1YCEeS0WsAAtVmToA" xmi:id="_R_pqgWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Lifeline" inheritance="all" target="_Scz2V1YCEeS0WsAAtVmToA" xmi:id="_R_pqg2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Message" inheritance="all" target="_Sc59FFYCEeS0WsAAtVmToA" xmi:id="_R_pqhGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.MessageEnd" inheritance="all" target="_Sc59FlYCEeS0WsAAtVmToA" xmi:id="_R_pqhWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.NamedElement" inheritance="all" target="_Sc6kDFYCEeS0WsAAtVmToA" xmi:id="_R_pqhmT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.NamedElementNameInitializer" inheritance="all" target="_Sc6kDFYCEeS0WsAAtVmToA" xmi:id="_R_pqh2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" inheritance="all" target="_Sc6kKlYCEeS0WsAAtVmToA" xmi:id="_R_pqiGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ParameterHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Parameter" inheritance="all" target="_Sc9nc1YCEeS0WsAAtVmToA" xmi:id="_R_pqiWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.PartDecomposition" target="_Sc-OaFYCEeS0WsAAtVmToA" xmi:id="_R_pqimT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.Property" inheritance="all" target="_Sc-1cFYCEeS0WsAAtVmToA" xmi:id="_R_pqi2T7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StructuredClassifierHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.StructuredClassifier" inheritance="all" target="_SdGxUVYCEeS0WsAAtVmToA" xmi:id="_R_pqjGT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityNodeHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ActivityNode" inheritance="all" target="_ScTgJVYCEeS0WsAAtVmToA" xmi:id="_R_pqjWT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityGroupEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.ActivityGroup" inheritance="all" target="_ScTgI1YCEeS0WsAAtVmToA" xmi:id="_R_pqjmT7EeSzFvTXGJPhUg" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations description="Advice for stereotype applications, primarily supplying them as dependents in the destruction of their base element." editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypeApplicationAdvice" identifier="org.eclipse.papyrus.uml.advice.StereotypeApplication" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA" xmi:id="_yHsHwOg-EeSqZs7o0maBIQ" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateableElementEditHelperAdvice" identifier="org.eclipse.papyrus.uml.advice.TemplateableElement" inheritance="all" target="_SdHYY1YCEeS0WsAAtVmToA" xmi:id="_OGm-gAR_EeWEmNqzWv7tuw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations description="Advice that tweaks requests to provide hints to the read-only advice" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UMLReadOnlyHintsAdvice" identifier="org.eclipse.papyrus.uml.advice.UMLReadOnlyHints" inheritance="all" target="_ScgUUFYCEeS0WsAAtVmToA" xmi:id="_hjfH8DCzEeWM9ILC16rEvw" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice_CommunicationPath" target="_Scbb2lYCEeS0WsAAtVmToA" xmi:id="_SJGO0DWbEeWdwYNHBiYLiA" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration"/>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
index 503a5d74ce4..8a5c60684ff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
@@ -2,21 +2,21 @@
 <?eclipse version="3.4"?>
 <plugin>
  <extension
-       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
     <elementTypeSet
     clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/uml.elementtypesconfigurations">
     </elementTypeSet>
  </extension>
   <extension
-       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
     <elementTypeSet
     clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/uml-containments.elementtypesconfigurations">
     </elementTypeSet>
  </extension>
  <extension
-       point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+       point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
     <elementTypeSet
     clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
           path="model/StandardProfile.elementtypesconfigurations">
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java
index ef419d79479..3b61ca68e6f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ElementEditHelper.java
@@ -27,8 +27,8 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper.DefaultUMLEditHelper;
 import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.papyrus.uml.types.core.edithelper.DefaultUMLEditHelper;
 import org.eclipse.uml2.uml.Element;
 
 /**
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
index 31d8d0b33de..9b6d04fa4ff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractFeatureRelationshipReorientEditHelperAdvice.java
@@ -12,9 +12,9 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.ElementTypeRegistryUtils;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultSemanticEditPolicy;

 import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

+import org.eclipse.papyrus.infra.types.core.utils.ElementTypeRegistryUtils;

 

 abstract public class AbstractFeatureRelationshipReorientEditHelperAdvice extends AbstractEditHelperAdvice {

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.classpath b/plugins/uml/org.eclipse.papyrus.uml.types.core/.classpath
index 756f4289006..afb9bb46ef3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.classpath
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src-gen"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/.project b/plugins/uml/org.eclipse.papyrus.uml.types.core/.project
new file mode 100644
index 00000000000..6656315c90a
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.uml.types.core</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.core.prefs
index c585cc455ae..4759947300a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,291 +1,291 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=false

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert

+org.eclipse.jdt.core.formatter.comment.line_length=260

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=2

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=260

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=false

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs b/plugins/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c07477230e8
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
@@ -0,0 +1,55 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.papyrus.infra.types;visibility:=reexport,

+ org.eclipse.uml2.types;visibility:=reexport,

+ org.eclipse.uml2.uml;visibility:=reexport,

+ org.eclipse.emf.edit;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.types.edit;visibility:=reexport,

+ org.eclipse.uml2.uml.edit;visibility:=reexport,

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

+ org.eclipse.swt,

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.ui.workbench,

+ org.eclipse.papyrus.infra.emf.types;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0";visibility:=reexport,

+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0"

+Export-Package: org.eclipse.papyrus.uml.types.core,

+ org.eclipse.papyrus.uml.types.core.advices.applystereotype,

+ org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl,

+ org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider,

+ org.eclipse.papyrus.uml.types.core.advices.applystereotype.util,

+ org.eclipse.papyrus.uml.types.core.advices.settype,

+ org.eclipse.papyrus.uml.types.core.advices.settype.impl,

+ org.eclipse.papyrus.uml.types.core.advices.settype.provider,

+ org.eclipse.papyrus.uml.types.core.advices.settype.util,

+ org.eclipse.papyrus.uml.types.core.commands,

+ org.eclipse.papyrus.uml.types.core.edithelper,

+ org.eclipse.papyrus.uml.types.core.matchers.stereotype,

+ org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl,

+ org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider,

+ org.eclipse.papyrus.uml.types.core.matchers.stereotype.util,

+ org.eclipse.papyrus.uml.types.core.requests,

+ org.eclipse.papyrus.uml.types.core.rules,

+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype,

+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl,

+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider,

+ org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-ManifestVersion: 2

+Bundle-Activator: org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationEditPlugin$Implementation

+Bundle-SymbolicName: org.eclipse.papyrus.uml.types.core;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/about.html b/plugins/uml/org.eclipse.papyrus.uml.types.core/about.html
index d35d5aed64c..82d49bf5f81 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/about.html
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/build.properties b/plugins/uml/org.eclipse.papyrus.uml.types.core/build.properties
index 9c8bb55b912..35e803df3ba 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/build.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/build.properties
@@ -1,8 +1,6 @@
-#
-#Mon Sep 12 09:29:52 CEST 2011
-output..=bin/
-bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html,icons/
-jars.compile.order=.
-src.includes = about.html
-source..=src-gen/,src/
-bin..=bin/
+output..=bin/

+bin.includes=.,model/,META-INF/,plugin.xml,plugin.properties,about.html,icons/

+jars.compile.order=.

+src.includes = about.html

+source..=src-gen/,src/

+bin..=bin/

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/Stereotype.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/Stereotype.gif
index b7ae8706f73..b7ae8706f73 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/Stereotype.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/Stereotype.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index fcfec345ba6..fcfec345ba6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateAbstractAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index 91bb42f1a6b..91bb42f1a6b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
index 95a741cb08d..95a741cb08d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateAdviceBindingConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif
index fe10b8e7be4..fe10b8e7be4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateApplyStereotypeActionConfiguration_stereotypesToApply_StereotypeToApply.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif
index 72cfbd01f7f..72cfbd01f7f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateApplyStereotypeAdviceConfiguration_stereotypesToApply_StereotypeToApply.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif
index d8b262a3bb1..d8b262a3bb1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
index 95a524524a9..95a524524a9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeInvariantRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
new file mode 100644
index 00000000000..3df71fca2c5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateCompositeRuleConfiguration_composedRules_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
index dac4138ca01..dac4138ca01 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_Duration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
index 755e4ca7a46..755e4ca7a46 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_DurationInterval.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_Expression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
index fe708946d58..fe708946d58 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_InstanceValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_Interval.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
index 44afafd55da..44afafd55da 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralBoolean.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
index f93c92d061a..f93c92d061a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralInteger.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
index 5ef9a94e8da..5ef9a94e8da 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralNull.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
index bbf242da6a9..bbf242da6a9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralReal.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
index f08356ef9bb..f08356ef9bb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralString.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
index 37dad615792..37dad615792 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_LiteralUnlimitedNatural.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
index 8ce82e3f6c7..8ce82e3f6c7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_OpaqueExpression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
index 4aaad5a4cd7..4aaad5a4cd7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_StringExpression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
index 33e07420851..33e07420851 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_TimeExpression.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
index e180c4cf7ca..e180c4cf7ca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateConstantValue_valueInstance_TimeInterval.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index f58e5a1f04f..f58e5a1f04f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif
index ff53277ff1c..ff53277ff1c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateContainerConfiguration_containerMatcherConfiguration_StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif
index 62e68eb5614..62e68eb5614 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeActionConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif
index 7b489fdd24d..7b489fdd24d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_ApplyStereotypeAdviceConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif
index 15cbbadd0dc..15cbbadd0dc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeActionConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif
index 1b149e889ab..1b149e889ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateElementTypeSetConfiguration_adviceBindingsConfigurations_SetTypeAdviceConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
index 03366e35d0f..03366e35d0f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateFeatureToSet_value_ConstantValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
index 8997497557c..8997497557c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateFeatureToSet_value_ListValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
index c048169804a..c048169804a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateFeatureToSet_value_QueryExecutionValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif
index a573a9e5f29..a573a9e5f29 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
index 09b8804bd23..09b8804bd23 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateInvariantSemanticTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
index e8daccd8af2..e8daccd8af2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateInvariantTypeConfiguration_invariantRuleConfiguration_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif
index 0a4d20c16db..0a4d20c16db 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateNotInvariantRuleConfiguration_composedRule_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_InvariantStereotypeRuleConfiguration.gif
new file mode 100644
index 00000000000..a12ae418141
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateRuleBasedTypeConfiguration_ruleConfiguration_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_InvariantStereotypeRuleConfiguration.gif
new file mode 100644
index 00000000000..34d83037854
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateRuledTypeConfiguration_ruleConfiguration_InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
index fcfec345ba6..fcfec345ba6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
index d8d5fa98a50..d8d5fa98a50 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateSpecializationTypeConfiguration_matcherConfiguration_StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif
index c561177716e..c561177716e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/ctool16/CreateStereotypeToApply_featuresToSet_FeatureToSet.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ApplyStereotypeActionConfiguration.gif
index 35ef84e20e2..35ef84e20e2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ApplyStereotypeActionConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif
index 14af8aaee9f..14af8aaee9f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ApplyStereotypeAdviceConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ConstantValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ConstantValue.gif
index e4bc22dd17e..e4bc22dd17e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ConstantValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ConstantValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/FeatureToSet.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/FeatureToSet.gif
index 5a9bc7514fa..5a9bc7514fa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/FeatureToSet.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/FeatureToSet.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/InvariantStereotypeConfiguration.gif
index c4a8af41844..c4a8af41844 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/InvariantStereotypeConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif
index 33854e98c25..33854e98c25 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/InvariantStereotypeRuleConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ListValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ListValue.gif
index c3370c7ddd5..c3370c7ddd5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/ListValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/ListValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/QueryExecutionValue.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/QueryExecutionValue.gif
index ed874747401..ed874747401 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/QueryExecutionValue.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/QueryExecutionValue.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeActionConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/SetTypeActionConfiguration.gif
index be22463d291..be22463d291 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeActionConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/SetTypeActionConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeAdviceConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/SetTypeAdviceConfiguration.gif
index ea58a657dc0..ea58a657dc0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/SetTypeAdviceConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/SetTypeAdviceConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif
index 904159880b3..904159880b3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/StereotypeApplicationMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeToApply.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/StereotypeToApply.gif
index caf2804510d..caf2804510d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypeToApply.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/StereotypeToApply.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypedElementMatcherConfiguration.gif b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/StereotypedElementMatcherConfiguration.gif
index d3dc5a9ad81..d3dc5a9ad81 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/icons/full/obj16/StereotypedElementMatcherConfiguration.gif
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/icons/full/obj16/StereotypedElementMatcherConfiguration.gif
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/ApplyStereotypeAdvice.ecore
index 6fed279d02e..22084f9cf3f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/ApplyStereotypeAdviceConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/ApplyStereotypeAdvice.ecore
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="applystereotypeadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1"
-    nsPrefix="applystereotypeadviceconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="ApplyStereotypeAdviceConfiguration"
-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypesToApply" upperBound="-1"
-        eType="#//StereotypeToApply" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StereotypeToApply">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfiles" lowerBound="1"
-        upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"
-        eType="#//FeatureToSet" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
-        eType="#//FeatureValue" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>
-  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="applystereotype" nsURI="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1"

+    nsPrefix="applystereotypeadvice">

+  <eClassifiers xsi:type="ecore:EClass" name="ApplyStereotypeAdviceConfiguration"

+      eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypesToApply" upperBound="-1"

+        eType="#//StereotypeToApply" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypeToApply">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="updateName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfiles" lowerBound="1"

+        upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="featuresToSet" upperBound="-1"

+        eType="#//FeatureToSet" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FeatureToSet">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="featureName" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//FeatureValue"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FeatureValue" abstract="true"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ListValue" eSuperTypes="#//FeatureValue">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"

+        eType="#//FeatureValue" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ConstantValue" eSuperTypes="#//FeatureValue">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="valueInstance" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//ValueSpecification"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DynamicValue" abstract="true" eSuperTypes="#//FeatureValue"/>

+  <eClassifiers xsi:type="ecore:EClass" name="QueryExecutionValue" eSuperTypes="#//DynamicValue"/>

+</ecore:EPackage>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/model/ApplyStereotypeAdvice.genmodel b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/ApplyStereotypeAdvice.genmodel
new file mode 100644
index 00000000000..96e6c69320a
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/ApplyStereotypeAdvice.genmodel
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.uml.types.core/src-gen" editDirectory="/org.eclipse.papyrus.uml.types.core/src-gen"

+    editorDirectory="/org.eclipse.papyrus.uml.types.core.editor/src-gen" modelPluginID="org.eclipse.papyrus.uml.types.core"

+    modelName="ApplyStereotypeAdvice" modelPluginClass="" testsDirectory="/org.eclipse.papyrus.uml.types.core.tests/src-gen"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">

+  <foreignModel>ApplyStereotypeAdvice.ecore</foreignModel>

+  <genPackages prefix="ApplyStereotypeAdvice" basePackage="org.eclipse.papyrus.uml.types.core.advices"

+      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"

+      ecorePackage="ApplyStereotypeAdvice.ecore#/">

+    <genClasses ecoreClass="ApplyStereotypeAdvice.ecore#//ApplyStereotypeAdviceConfiguration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdvice.ecore#//ApplyStereotypeAdviceConfiguration/stereotypesToApply"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplyStereotypeAdvice.ecore#//StereotypeToApply">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdvice.ecore#//StereotypeToApply/stereotypeQualifiedName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdvice.ecore#//StereotypeToApply/updateName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdvice.ecore#//StereotypeToApply/requiredProfiles"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdvice.ecore#//StereotypeToApply/featuresToSet"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplyStereotypeAdvice.ecore#//FeatureToSet">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ApplyStereotypeAdvice.ecore#//FeatureToSet/featureName"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdvice.ecore#//FeatureToSet/value"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="ApplyStereotypeAdvice.ecore#//FeatureValue"/>

+    <genClasses ecoreClass="ApplyStereotypeAdvice.ecore#//ListValue">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ApplyStereotypeAdvice.ecore#//ListValue/values"/>

+    </genClasses>

+    <genClasses ecoreClass="ApplyStereotypeAdvice.ecore#//ConstantValue">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplyStereotypeAdvice.ecore#//ConstantValue/valueInstance"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="ApplyStereotypeAdvice.ecore#//DynamicValue"/>

+    <genClasses ecoreClass="ApplyStereotypeAdvice.ecore#//QueryExecutionValue"/>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/InvariantStereotypeRule.ecore
index 81fbcf42776..841298fceb5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/InvariantStereotypeRuleConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/InvariantStereotypeRule.ecore
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="invariantstereotyperuleconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1"
-    nsPrefix="invariantstereotyperuleconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="InvariantStereotypeRuleConfiguration"
-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes/model/InvariantTypeConfiguration.ecore#//InvariantRuleConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName"
-        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfile" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="invariantstereotype" nsURI="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1"

+    nsPrefix="invariantstereotyperule">

+  <eClassifiers xsi:type="ecore:EClass" name="InvariantStereotypeRuleConfiguration"

+      eSuperTypes="../../org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.ecore#//RuleConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeQualifiedName"

+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredProfile" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="strict" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/model/InvariantStereotypeRule.genmodel b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/InvariantStereotypeRule.genmodel
new file mode 100644
index 00000000000..c703362fcc5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/InvariantStereotypeRule.genmodel
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.uml.types.core/src-gen" editDirectory="/org.eclipse.papyrus.uml.types.core/src-gen"

+    editorDirectory="/org.eclipse.papyrus.uml.types.core.editor/src-gen" modelPluginID="org.eclipse.papyrus.uml.types.core"

+    modelName="InvariantStereotypeRuleConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    codeFormatting="true" testsDirectory="/org.eclipse.papyrus.uml.types.core.tests/src-gen"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

+    editPluginID="org.eclipse.papyrus.uml.types.core" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/RuleBased.genmodel#//rulebased"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>InvariantStereotypeRule.ecore</foreignModel>

+  <genPackages prefix="InvariantStereotypeRuleConfiguration" basePackage="org.eclipse.papyrus.uml.types.core.rules"

+      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"

+      ecorePackage="InvariantStereotypeRule.ecore#/">

+    <genClasses ecoreClass="InvariantStereotypeRule.ecore#//InvariantStereotypeRuleConfiguration">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeRule.ecore#//InvariantStereotypeRuleConfiguration/stereotypeQualifiedName"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeRule.ecore#//InvariantStereotypeRuleConfiguration/requiredProfile"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute InvariantStereotypeRule.ecore#//InvariantStereotypeRuleConfiguration/strict"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/SetTypeAdvice.ecore
index cc60b54f72d..cacd671ee28 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/SetTypeAdvice.ecore
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="settypeadviceconfiguration" nsURI="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1"
-    nsPrefix="settypeadviceconfiguration">
-  <eClassifiers xsi:type="ecore:EClass" name="SetTypeAdviceConfiguration" eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validTypes" upperBound="-1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationTypes" upperBound="-1"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="settype" nsURI="http://www.eclipse.org/papyrus/uml/types/settypeadvice/1.1"

+    nsPrefix="settypeadvice">

+  <eClassifiers xsi:type="ecore:EClass" name="SetTypeAdviceConfiguration" eSuperTypes="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractAdviceBindingConfiguration">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validTypes" upperBound="-1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="creationTypes" upperBound="-1"

+        eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.genmodel b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/SetTypeAdvice.genmodel
index 6912b05824c..c6d5c5e35ec 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/SetTypeAdviceConfiguration.genmodel
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/SetTypeAdvice.genmodel
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen"
-    editorDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.uml.elementtypesconfigurations" modelName="SetTypeAdviceConfiguration"
-    modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="/org.eclipse.papyrus.uml.elementtypesconfigurations.tests/src-gen"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.genmodel#//elementtypesconfigurations"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>SetTypeAdviceConfiguration.ecore</foreignModel>
-  <genPackages prefix="SetTypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.elementtypesconfigurations"
-      disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="SetTypeAdviceConfiguration.ecore#/">
-    <genClasses ecoreClass="SetTypeAdviceConfiguration.ecore#//SetTypeAdviceConfiguration">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeAdviceConfiguration.ecore#//SetTypeAdviceConfiguration/validTypes"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeAdviceConfiguration.ecore#//SetTypeAdviceConfiguration/creationTypes"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"

+    modelDirectory="/org.eclipse.papyrus.uml.types.core/src-gen"

+    editDirectory="/org.eclipse.papyrus.uml.types.core/src-gen"

+    editorDirectory="/org.eclipse.papyrus.uml.types.core.editor/src-gen"

+    modelPluginID="org.eclipse.papyrus.uml.types.core" modelName="SetTypeAdvice"

+    modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    testsDirectory="/org.eclipse.papyrus.uml.types.core.tests/src-gen"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>SetTypeAdvice.ecore</foreignModel>

+  <genPackages prefix="SetTypeAdviceConfiguration" basePackage="org.eclipse.papyrus.uml.types.core.advices"

+      disposableProviderFactory="true" childCreationExtenders="true" ecorePackage="SetTypeAdvice.ecore#/">

+    <genClasses ecoreClass="SetTypeAdvice.ecore#//SetTypeAdviceConfiguration">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeAdvice.ecore#//SetTypeAdviceConfiguration/validTypes"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SetTypeAdvice.ecore#//SetTypeAdviceConfiguration/creationTypes"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.ecore b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/StereotypeMatcher.ecore
index 7ed203c463a..d009de33081 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/model/StereotypeApplicationMatcherConfiguration.ecore
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/StereotypeMatcher.ecore
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="stereotypeapplicationmatcherconfiguration" nsURI="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1"
-    nsPrefix="stereotypeapplicationmatcherconfiguration">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="stereotype" nsURI="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1"
+    nsPrefix="stereotypematcher">
   <eClassifiers xsi:type="ecore:EClass" name="StereotypeApplicationMatcherConfiguration"
-      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations/model/ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration">
+      eSuperTypes="platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//AbstractMatcherConfiguration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypesQualifiedNames"
         lowerBound="1" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="profileUri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/model/StereotypeMatcher.genmodel b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/StereotypeMatcher.genmodel
new file mode 100644
index 00000000000..78d78c82f6c
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/model/StereotypeMatcher.genmodel
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST.&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
+    modelDirectory="/org.eclipse.papyrus.uml.types.core/src-gen" editDirectory="/org.eclipse.papyrus.uml.types.core/src-gen"
+    editorDirectory="/org.eclipse.papyrus.uml.types.core.editor/src-gen" modelPluginID="org.eclipse.papyrus.uml.types.core"
+    modelName="StereotypeApplicationMatcherConfiguration" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="/org.eclipse.papyrus.uml.types.core.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="7.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>StereotypeMatcher.ecore</foreignModel>
+  <genPackages prefix="StereotypeApplicationMatcher" basePackage="org.eclipse.papyrus.uml.types.core.matchers"
+      resource="XML" disposableProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="StereotypeMatcher.ecore#/">
+    <genClasses ecoreClass="StereotypeMatcher.ecore#//StereotypeApplicationMatcherConfiguration">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StereotypeMatcher.ecore#//StereotypeApplicationMatcherConfiguration/stereotypesQualifiedNames"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute StereotypeMatcher.ecore#//StereotypeApplicationMatcherConfiguration/profileUri"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties
index 924e199165e..46ac51d3ac3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.properties
@@ -37,7 +37,7 @@ _UI_FeatureToSet_value_feature = Value
 _UI_ListValue_values_feature = Values
 _UI_ConstantValue_valueInstance_feature = Value Instance
 _UI_Unknown_feature = Unspecified
-
+

 _UI_InvariantStereotypeRuleConfiguration_type = Invariant Stereotype Rule Configuration
 _UI_InvariantStereotypeRuleConfiguration_stereotypeQualifiedName_feature = Stereotype Qualified Name
 _UI_InvariantStereotypeRuleConfiguration_requiredProfile_feature = Required Profile
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.xml
new file mode 100644
index 00000000000..b820825bf5b
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/plugin.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<plugin>

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+
+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated SetTypeAdvice -->

+      <package

+            uri="http://www.eclipse.org/papyrus/uml/types/settypeadvice/1.1"

+            class="org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage"

+            genModel="model/SetTypeAdvice.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated SetTypeAdvice -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/uml/types/settypeadvice/1.1"

+            class="org.eclipse.papyrus.uml.types.core.advices.settype.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.childCreationExtenders">

+      <!-- @generated SetTypeAdvice -->

+      <extender

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

+            class="org.eclipse.papyrus.uml.types.core.advices.settype.provider.SetTypeAdviceConfigurationItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated InvariantStereotypeRule -->

+      <package

+            uri="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1"

+            class="org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage"

+            genModel="model/InvariantStereotypeRule.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated InvariantStereotypeRule -->

+      <parser

+            type="invariantstereotyperuleconfiguration"

+            class="org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated InvariantStereotypeRule -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1"

+            class="org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.childCreationExtenders">

+      <!-- @generated InvariantStereotypeRule -->

+      <extender

+            uri="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1"

+            class="org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider.InvariantStereotypeRuleConfigurationItemProviderAdapterFactory$RuleBasedChildCreationExtender"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated ApplyStereotypeAdvice -->

+      <package

+            uri="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1"

+            class="org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage"

+            genModel="model/ApplyStereotypeAdvice.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated ApplyStereotypeAdvice -->

+      <parser

+            type="applystereotypeadvice"

+            class="org.eclipse.papyrus.uml.types.core.advices.applystereotype.util.ApplyStereotypeAdviceResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated ApplyStereotypeAdvice -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1"

+            class="org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider.ApplyStereotypeAdviceItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.childCreationExtenders">

+      <!-- @generated ApplyStereotypeAdvice -->

+      <extender

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

+            class="org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider.ApplyStereotypeAdviceItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated StereotypeMatcher -->

+      <package

+            uri="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1"

+            class="org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage"

+            genModel="model/StereotypeMatcher.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated StereotypeMatcher -->

+      <parser

+            type="stereotypeapplicationmatcher"

+            class="org.eclipse.papyrus.uml.types.core.matchers.stereotype.util.StereotypeApplicationMatcherResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated StereotypeMatcher -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1"

+            class="org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider.StereotypeApplicationMatcherItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.childCreationExtenders">

+      <!-- @generated StereotypeMatcher -->

+      <extender

+            uri="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1"

+            class="org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider.StereotypeApplicationMatcherItemProviderAdapterFactory$ElementTypesConfigurationsChildCreationExtender"/>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.types.core.adviceConfigurationKind">

+      <adviceConfigurationKind

+            configurationClass="org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration"

+            factoryClass="org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfigurationFactory">

+      </adviceConfigurationKind>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.types.core.adviceConfigurationKind">

+      <adviceConfigurationKind

+            configurationClass="org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration"

+            factoryClass="org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceFactory">

+      </adviceConfigurationKind>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.types.rulebased.ruleKind">

+      <ruleKind

+            configurationClass="org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration"

+            ruleClass="org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRule">

+      </ruleKind>

+   </extension>

+   <extension

+         point="org.eclipse.papyrus.infra.types.core.matcherConfigurationKind">

+      <matcherConfigurationKind

+            configurationClass="org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration"

+            factoryClass="org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfigurationFactory">

+      </matcherConfigurationKind>

+   </extension>

+

+</plugin>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml
new file mode 100644
index 00000000000..1024dbc7f4c
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.uml</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>org.eclipse.papyrus.uml.types.core</artifactId>
+	<version>1.2.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceConfiguration.java
index 1e0778f89dd..ccee86b253a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceConfiguration.java
@@ -10,32 +10,32 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Apply Stereotype Advice Configuration</b></em>'.
+ * A representation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getApplyStereotypeAdviceConfiguration()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getApplyStereotypeAdviceConfiguration()
  * @model
  * @generated
  */
 public interface ApplyStereotypeAdviceConfiguration extends AbstractAdviceBindingConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Stereotypes To Apply</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply}.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Stereotypes To Apply</em>' containment reference list isn't clear,
@@ -43,7 +43,7 @@ public interface ApplyStereotypeAdviceConfiguration extends AbstractAdviceBindin
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes To Apply</em>' containment reference list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getApplyStereotypeAdviceConfiguration_StereotypesToApply()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getApplyStereotypeAdviceConfiguration_StereotypesToApply()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceFactory.java
index 97998b1fb39..a39c3522c88 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,23 +19,23 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage
  * @generated
  */
-public interface ApplyStereotypeAdviceConfigurationFactory extends EFactory {
+public interface ApplyStereotypeAdviceFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ApplyStereotypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationFactoryImpl.init();
+	ApplyStereotypeAdviceFactory eINSTANCE = org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdviceFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Apply Stereotype Advice Configuration</em>'.
+	 * Returns a new object of class '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Apply Stereotype Advice Configuration</em>'.
+	 * @return a new object of class '<em>Configuration</em>'.
 	 * @generated
 	 */
 	ApplyStereotypeAdviceConfiguration createApplyStereotypeAdviceConfiguration();
@@ -92,6 +92,6 @@ public interface ApplyStereotypeAdviceConfigurationFactory extends EFactory {
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	ApplyStereotypeAdviceConfigurationPackage getApplyStereotypeAdviceConfigurationPackage();
+	ApplyStereotypeAdvicePackage getApplyStereotypeAdvicePackage();
 
-} //ApplyStereotypeAdviceConfigurationFactory
+} //ApplyStereotypeAdviceFactory
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdvicePackage.java
index 1fad8c1293f..56968bde9d7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdvicePackage.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,18 +30,18 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory
  * @model kind="package"
  * @generated
  */
-public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
+public interface ApplyStereotypeAdvicePackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "applystereotypeadviceconfiguration";
+	String eNAME = "applystereotype";
 
 	/**
 	 * The package namespace URI.
@@ -49,7 +49,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1";
 
 	/**
 	 * The package namespace name.
@@ -57,7 +57,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "applystereotypeadviceconfiguration";
+	String eNS_PREFIX = "applystereotypeadvice";
 
 	/**
 	 * The singleton instance of the package.
@@ -65,14 +65,14 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	ApplyStereotypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl.init();
+	ApplyStereotypeAdvicePackage eINSTANCE = org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl <em>Apply Stereotype Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdviceConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getApplyStereotypeAdviceConfiguration()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getApplyStereotypeAdviceConfiguration()
 	 * @generated
 	 */
 	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION = 0;
@@ -84,7 +84,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__DESCRIPTION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' attribute list.
@@ -93,7 +93,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__BEFORE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__BEFORE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
 
 	/**
 	 * The feature id for the '<em><b>After</b></em>' attribute list.
@@ -102,7 +102,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__AFTER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__AFTER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -111,7 +111,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__IDENTIFIER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
 
 	/**
 	 * The feature id for the '<em><b>Target</b></em>' reference.
@@ -120,7 +120,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__TARGET = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__TARGET = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
 
 	/**
 	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
@@ -129,7 +129,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
 
 	/**
 	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
@@ -138,7 +138,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
 
 	/**
 	 * The feature id for the '<em><b>Inheritance</b></em>' attribute.
@@ -147,7 +147,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__INHERITANCE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__INHERITANCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
 
 	/**
 	 * The feature id for the '<em><b>Stereotypes To Apply</b></em>' containment reference list.
@@ -156,23 +156,23 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
-	 * The number of structural features of the '<em>Apply Stereotype Advice Configuration</em>' class.
+	 * The number of structural features of the '<em>Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
+	int APPLY_STEREOTYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getStereotypeToApply()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getStereotypeToApply()
 	 * @generated
 	 */
 	int STEREOTYPE_TO_APPLY = 1;
@@ -223,11 +223,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int STEREOTYPE_TO_APPLY_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureToSet()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureToSetImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getFeatureToSet()
 	 * @generated
 	 */
 	int FEATURE_TO_SET = 2;
@@ -260,11 +260,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int FEATURE_TO_SET_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureValueImpl <em>Feature Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureValue()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureValueImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getFeatureValue()
 	 * @generated
 	 */
 	int FEATURE_VALUE = 3;
@@ -279,11 +279,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int FEATURE_VALUE_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ListValueImpl <em>List Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getListValue()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ListValueImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getListValue()
 	 * @generated
 	 */
 	int LIST_VALUE = 4;
@@ -307,11 +307,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int LIST_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ConstantValueImpl <em>Constant Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getConstantValue()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ConstantValueImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getConstantValue()
 	 * @generated
 	 */
 	int CONSTANT_VALUE = 5;
@@ -335,11 +335,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int CONSTANT_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getDynamicValue()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.DynamicValueImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getDynamicValue()
 	 * @generated
 	 */
 	int DYNAMIC_VALUE = 6;
@@ -354,11 +354,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	int DYNAMIC_VALUE_FEATURE_COUNT = FEATURE_VALUE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getQueryExecutionValue()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.QueryExecutionValueImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getQueryExecutionValue()
 	 * @generated
 	 */
 	int QUERY_EXECUTION_VALUE = 7;
@@ -374,180 +374,180 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration <em>Apply Stereotype Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Apply Stereotype Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
+	 * @return the meta object for class '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration
 	 * @generated
 	 */
 	EClass getApplyStereotypeAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration#getStereotypesToApply <em>Stereotypes To Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Stereotypes To Apply</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration#getStereotypesToApply()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration#getStereotypesToApply()
 	 * @see #getApplyStereotypeAdviceConfiguration()
 	 * @generated
 	 */
 	EReference getApplyStereotypeAdviceConfiguration_StereotypesToApply();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply <em>Stereotype To Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Stereotype To Apply</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply
 	 * @generated
 	 */
 	EClass getStereotypeToApply();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getStereotypeQualifiedName()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EAttribute getStereotypeToApply_StereotypeQualifiedName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#isUpdateName <em>Update Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Update Name</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#isUpdateName()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EAttribute getStereotypeToApply_UpdateName();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Required Profiles</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getRequiredProfiles()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EAttribute getStereotypeToApply_RequiredProfiles();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Features To Set</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getFeaturesToSet()
 	 * @see #getStereotypeToApply()
 	 * @generated
 	 */
 	EReference getStereotypeToApply_FeaturesToSet();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet <em>Feature To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature To Set</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet
 	 * @generated
 	 */
 	EClass getFeatureToSet();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getFeatureName <em>Feature Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Feature Name</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getFeatureName()
 	 * @see #getFeatureToSet()
 	 * @generated
 	 */
 	EAttribute getFeatureToSet_FeatureName();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getValue()
 	 * @see #getFeatureToSet()
 	 * @generated
 	 */
 	EReference getFeatureToSet_Value();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue <em>Feature Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Value</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue
 	 * @generated
 	 */
 	EClass getFeatureValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue <em>List Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue <em>List Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>List Value</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue
 	 * @generated
 	 */
 	EClass getListValue();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues <em>Values</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue#getValues <em>Values</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Values</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue#getValues()
 	 * @see #getListValue()
 	 * @generated
 	 */
 	EReference getListValue_Values();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue <em>Constant Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Constant Value</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue
 	 * @generated
 	 */
 	EClass getConstantValue();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue#getValueInstance <em>Value Instance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Value Instance</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue#getValueInstance()
 	 * @see #getConstantValue()
 	 * @generated
 	 */
 	EReference getConstantValue_ValueInstance();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue <em>Dynamic Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Dynamic Value</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue
 	 * @generated
 	 */
 	EClass getDynamicValue();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue <em>Query Execution Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Query Execution Value</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue
 	 * @generated
 	 */
 	EClass getQueryExecutionValue();
@@ -559,7 +559,7 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	ApplyStereotypeAdviceConfigurationFactory getApplyStereotypeAdviceConfigurationFactory();
+	ApplyStereotypeAdviceFactory getApplyStereotypeAdviceFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -575,11 +575,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl <em>Apply Stereotype Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdviceConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getApplyStereotypeAdviceConfiguration()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getApplyStereotypeAdviceConfiguration()
 		 * @generated
 		 */
 		EClass APPLY_STEREOTYPE_ADVICE_CONFIGURATION = eINSTANCE.getApplyStereotypeAdviceConfiguration();
@@ -593,11 +593,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY = eINSTANCE.getApplyStereotypeAdviceConfiguration_StereotypesToApply();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl <em>Stereotype To Apply</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getStereotypeToApply()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getStereotypeToApply()
 		 * @generated
 		 */
 		EClass STEREOTYPE_TO_APPLY = eINSTANCE.getStereotypeToApply();
@@ -635,11 +635,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference STEREOTYPE_TO_APPLY__FEATURES_TO_SET = eINSTANCE.getStereotypeToApply_FeaturesToSet();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureToSetImpl <em>Feature To Set</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureToSet()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureToSetImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getFeatureToSet()
 		 * @generated
 		 */
 		EClass FEATURE_TO_SET = eINSTANCE.getFeatureToSet();
@@ -661,21 +661,21 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference FEATURE_TO_SET__VALUE = eINSTANCE.getFeatureToSet_Value();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl <em>Feature Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureValueImpl <em>Feature Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureValueImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getFeatureValue()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureValueImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getFeatureValue()
 		 * @generated
 		 */
 		EClass FEATURE_VALUE = eINSTANCE.getFeatureValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl <em>List Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ListValueImpl <em>List Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ListValueImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getListValue()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ListValueImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getListValue()
 		 * @generated
 		 */
 		EClass LIST_VALUE = eINSTANCE.getListValue();
@@ -689,11 +689,11 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference LIST_VALUE__VALUES = eINSTANCE.getListValue_Values();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl <em>Constant Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ConstantValueImpl <em>Constant Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getConstantValue()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ConstantValueImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getConstantValue()
 		 * @generated
 		 */
 		EClass CONSTANT_VALUE = eINSTANCE.getConstantValue();
@@ -707,25 +707,25 @@ public interface ApplyStereotypeAdviceConfigurationPackage extends EPackage {
 		EReference CONSTANT_VALUE__VALUE_INSTANCE = eINSTANCE.getConstantValue_ValueInstance();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.DynamicValueImpl <em>Dynamic Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.DynamicValueImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getDynamicValue()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.DynamicValueImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getDynamicValue()
 		 * @generated
 		 */
 		EClass DYNAMIC_VALUE = eINSTANCE.getDynamicValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.QueryExecutionValueImpl <em>Query Execution Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.QueryExecutionValueImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationPackageImpl#getQueryExecutionValue()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.QueryExecutionValueImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdvicePackageImpl#getQueryExecutionValue()
 		 * @generated
 		 */
 		EClass QUERY_EXECUTION_VALUE = eINSTANCE.getQueryExecutionValue();
 
 	}
 
-} //ApplyStereotypeAdviceConfigurationPackage
+} //ApplyStereotypeAdvicePackage
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ConstantValue.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ConstantValue.java
index a748f6c6294..5dac71d983b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ConstantValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ConstantValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -23,10 +23,10 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue#getValueInstance <em>Value Instance</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getConstantValue()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getConstantValue()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface ConstantValue extends FeatureValue {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value Instance</em>' containment reference.
 	 * @see #setValueInstance(ValueSpecification)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getConstantValue_ValueInstance()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getConstantValue_ValueInstance()
 	 * @model containment="true"
 	 * @generated
 	 */
 	ValueSpecification getValueInstance();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue#getValueInstance <em>Value Instance</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value Instance</em>' containment reference.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/DynamicValue.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/DynamicValue.java
index 1c4562f0a5e..d39cc82cb5f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/DynamicValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/DynamicValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 
 /**
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvice
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getDynamicValue()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getDynamicValue()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureToSet.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/FeatureToSet.java
index 297392d5cb0..a84886dadc1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureToSet.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/FeatureToSet.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -23,11 +23,11 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getFeatureName <em>Feature Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getValue <em>Value</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getFeatureToSet()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Feature Name</em>' attribute.
 	 * @see #setFeatureName(String)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet_FeatureName()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getFeatureToSet_FeatureName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getFeatureName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getFeatureName <em>Feature Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Feature Name</em>' attribute.
@@ -68,14 +68,14 @@ public interface FeatureToSet extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Value</em>' containment reference.
 	 * @see #setValue(FeatureValue)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureToSet_Value()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getFeatureToSet_Value()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
 	FeatureValue getValue();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet#getValue <em>Value</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet#getValue <em>Value</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Value</em>' containment reference.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureValue.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/FeatureValue.java
index 9a26a62b750..2b7064a6d5f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/FeatureValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/FeatureValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.ecore.EObject;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getFeatureValue()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getFeatureValue()
  * @model abstract="true"
  * @generated
  */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ListValue.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ListValue.java
index bfc5d114d32..e4521c40cd1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ListValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ListValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -23,17 +23,17 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue#getValues <em>Values</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getListValue()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getListValue()
  * @model
  * @generated
  */
 public interface ListValue extends FeatureValue {
 	/**
 	 * Returns the value of the '<em><b>Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue}.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Values</em>' containment reference list isn't clear,
@@ -41,7 +41,7 @@ public interface ListValue extends FeatureValue {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Values</em>' containment reference list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getListValue_Values()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getListValue_Values()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/QueryExecutionValue.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/QueryExecutionValue.java
index 2408f9d7f90..14f102e2b40 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/QueryExecutionValue.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/QueryExecutionValue.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 
 /**
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvice
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getQueryExecutionValue()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getQueryExecutionValue()
  * @model
  * @generated
  */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeToApply.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/StereotypeToApply.java
index e1d2575626e..95f2af9e277 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeToApply.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/StereotypeToApply.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -25,13 +25,13 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#isUpdateName <em>Update Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getRequiredProfiles <em>Required Profiles</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getFeaturesToSet <em>Features To Set</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply()
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getStereotypeToApply()
  * @model
  * @generated
  */
@@ -46,14 +46,14 @@ public interface StereotypeToApply extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotype Qualified Name</em>' attribute.
 	 * @see #setStereotypeQualifiedName(String)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_StereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getStereotypeToApply_StereotypeQualifiedName()
 	 * @model
 	 * @generated
 	 */
 	String getStereotypeQualifiedName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute.
@@ -72,14 +72,14 @@ public interface StereotypeToApply extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Update Name</em>' attribute.
 	 * @see #setUpdateName(boolean)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_UpdateName()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getStereotypeToApply_UpdateName()
 	 * @model
 	 * @generated
 	 */
 	boolean isUpdateName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply#isUpdateName <em>Update Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply#isUpdateName <em>Update Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Update Name</em>' attribute.
@@ -98,7 +98,7 @@ public interface StereotypeToApply extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Required Profiles</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_RequiredProfiles()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getStereotypeToApply_RequiredProfiles()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -106,7 +106,7 @@ public interface StereotypeToApply extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Features To Set</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet}.
+	 * The list contents are of type {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Features To Set</em>' containment reference list isn't clear,
@@ -114,7 +114,7 @@ public interface StereotypeToApply extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Features To Set</em>' containment reference list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#getStereotypeToApply_FeaturesToSet()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#getStereotypeToApply_FeaturesToSet()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ApplyStereotypeAdviceConfigurationImpl.java
index 405e057a714..41e594ef12f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ApplyStereotypeAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import java.util.Collection;
 
@@ -24,21 +24,21 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl;
+import org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Apply Stereotype Advice Configuration</b></em>'.
+ * An implementation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ApplyStereotypeAdviceConfigurationImpl#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ApplyStereotypeAdviceConfigurationImpl#getStereotypesToApply <em>Stereotypes To Apply</em>}</li>
  * </ul>
  *
  * @generated
@@ -70,7 +70,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.APPLY_STEREOTYPE_ADVICE_CONFIGURATION;
+		return ApplyStereotypeAdvicePackage.Literals.APPLY_STEREOTYPE_ADVICE_CONFIGURATION;
 	}
 
 	/**
@@ -80,7 +80,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	 */
 	public EList<StereotypeToApply> getStereotypesToApply() {
 		if (stereotypesToApply == null) {
-			stereotypesToApply = new EObjectContainmentEList<StereotypeToApply>(StereotypeToApply.class, this, ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY);
+			stereotypesToApply = new EObjectContainmentEList<StereotypeToApply>(StereotypeToApply.class, this, ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY);
 		}
 		return stereotypesToApply;
 	}
@@ -93,7 +93,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
 				return ((InternalEList<?>)getStereotypesToApply()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -107,7 +107,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
 				return getStereotypesToApply();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -122,7 +122,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
 				getStereotypesToApply().clear();
 				getStereotypesToApply().addAll((Collection<? extends StereotypeToApply>)newValue);
 				return;
@@ -138,7 +138,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
 				getStereotypesToApply().clear();
 				return;
 		}
@@ -153,7 +153,7 @@ public class ApplyStereotypeAdviceConfigurationImpl extends AbstractAdviceBindin
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
 				return stereotypesToApply != null && !stereotypesToApply.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ApplyStereotypeAdviceFactoryImpl.java
index 174755c41e6..618bcdd37aa 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ApplyStereotypeAdviceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,24 +28,24 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * <!-- end-user-doc -->
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationFactoryImpl extends EFactoryImpl implements ApplyStereotypeAdviceConfigurationFactory {
+public class ApplyStereotypeAdviceFactoryImpl extends EFactoryImpl implements ApplyStereotypeAdviceFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static ApplyStereotypeAdviceConfigurationFactory init() {
+	public static ApplyStereotypeAdviceFactory init() {
 		try {
-			ApplyStereotypeAdviceConfigurationFactory theApplyStereotypeAdviceConfigurationFactory = (ApplyStereotypeAdviceConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(ApplyStereotypeAdviceConfigurationPackage.eNS_URI);
-			if (theApplyStereotypeAdviceConfigurationFactory != null) {
-				return theApplyStereotypeAdviceConfigurationFactory;
+			ApplyStereotypeAdviceFactory theApplyStereotypeAdviceFactory = (ApplyStereotypeAdviceFactory)EPackage.Registry.INSTANCE.getEFactory(ApplyStereotypeAdvicePackage.eNS_URI);
+			if (theApplyStereotypeAdviceFactory != null) {
+				return theApplyStereotypeAdviceFactory;
 			}
 		}
 		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new ApplyStereotypeAdviceConfigurationFactoryImpl();
+		return new ApplyStereotypeAdviceFactoryImpl();
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class ApplyStereotypeAdviceConfigurationFactoryImpl extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationFactoryImpl() {
+	public ApplyStereotypeAdviceFactoryImpl() {
 		super();
 	}
 
@@ -66,12 +66,12 @@ public class ApplyStereotypeAdviceConfigurationFactoryImpl extends EFactoryImpl
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION: return createApplyStereotypeAdviceConfiguration();
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY: return createStereotypeToApply();
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET: return createFeatureToSet();
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE: return createListValue();
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE: return createConstantValue();
-			case ApplyStereotypeAdviceConfigurationPackage.QUERY_EXECUTION_VALUE: return createQueryExecutionValue();
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION: return createApplyStereotypeAdviceConfiguration();
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY: return createStereotypeToApply();
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET: return createFeatureToSet();
+			case ApplyStereotypeAdvicePackage.LIST_VALUE: return createListValue();
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE: return createConstantValue();
+			case ApplyStereotypeAdvicePackage.QUERY_EXECUTION_VALUE: return createQueryExecutionValue();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -142,8 +142,8 @@ public class ApplyStereotypeAdviceConfigurationFactoryImpl extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationPackage getApplyStereotypeAdviceConfigurationPackage() {
-		return (ApplyStereotypeAdviceConfigurationPackage)getEPackage();
+	public ApplyStereotypeAdvicePackage getApplyStereotypeAdvicePackage() {
+		return (ApplyStereotypeAdvicePackage)getEPackage();
 	}
 
 	/**
@@ -153,8 +153,8 @@ public class ApplyStereotypeAdviceConfigurationFactoryImpl extends EFactoryImpl
 	 * @generated
 	 */
 	@Deprecated
-	public static ApplyStereotypeAdviceConfigurationPackage getPackage() {
-		return ApplyStereotypeAdviceConfigurationPackage.eINSTANCE;
+	public static ApplyStereotypeAdvicePackage getPackage() {
+		return ApplyStereotypeAdvicePackage.eINSTANCE;
 	}
 
-} //ApplyStereotypeAdviceConfigurationFactoryImpl
+} //ApplyStereotypeAdviceFactoryImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ApplyStereotypeAdvicePackageImpl.java
index 32a8c3101ad..55899d88fa2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ApplyStereotypeAdviceConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ApplyStereotypeAdvicePackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,18 +20,18 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply;
 
 import org.eclipse.uml2.uml.UMLPackage;
 
@@ -41,7 +41,7 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl implements ApplyStereotypeAdviceConfigurationPackage {
+public class ApplyStereotypeAdvicePackageImpl extends EPackageImpl implements ApplyStereotypeAdvicePackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -109,12 +109,12 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private ApplyStereotypeAdviceConfigurationPackageImpl() {
-		super(eNS_URI, ApplyStereotypeAdviceConfigurationFactory.eINSTANCE);
+	private ApplyStereotypeAdvicePackageImpl() {
+		super(eNS_URI, ApplyStereotypeAdviceFactory.eINSTANCE);
 	}
 
 	/**
@@ -127,7 +127,7 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link ApplyStereotypeAdviceConfigurationPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link ApplyStereotypeAdvicePackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -136,31 +136,31 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static ApplyStereotypeAdviceConfigurationPackage init() {
-		if (isInited) return (ApplyStereotypeAdviceConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplyStereotypeAdviceConfigurationPackage.eNS_URI);
+	public static ApplyStereotypeAdvicePackage init() {
+		if (isInited) return (ApplyStereotypeAdvicePackage)EPackage.Registry.INSTANCE.getEPackage(ApplyStereotypeAdvicePackage.eNS_URI);
 
 		// Obtain or create and register package
-		ApplyStereotypeAdviceConfigurationPackageImpl theApplyStereotypeAdviceConfigurationPackage = (ApplyStereotypeAdviceConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ApplyStereotypeAdviceConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ApplyStereotypeAdviceConfigurationPackageImpl());
+		ApplyStereotypeAdvicePackageImpl theApplyStereotypeAdvicePackage = (ApplyStereotypeAdvicePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ApplyStereotypeAdvicePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ApplyStereotypeAdvicePackageImpl());
 
 		isInited = true;
 
 		// Initialize simple dependencies
-		ElementtypesconfigurationsPackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
 		UMLPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
-		theApplyStereotypeAdviceConfigurationPackage.createPackageContents();
+		theApplyStereotypeAdvicePackage.createPackageContents();
 
 		// Initialize created meta-data
-		theApplyStereotypeAdviceConfigurationPackage.initializePackageContents();
+		theApplyStereotypeAdvicePackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		theApplyStereotypeAdviceConfigurationPackage.freeze();
+		theApplyStereotypeAdvicePackage.freeze();
 
   
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(ApplyStereotypeAdviceConfigurationPackage.eNS_URI, theApplyStereotypeAdviceConfigurationPackage);
-		return theApplyStereotypeAdviceConfigurationPackage;
+		EPackage.Registry.INSTANCE.put(ApplyStereotypeAdvicePackage.eNS_URI, theApplyStereotypeAdvicePackage);
+		return theApplyStereotypeAdvicePackage;
 	}
 
 	/**
@@ -321,8 +321,8 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationFactory getApplyStereotypeAdviceConfigurationFactory() {
-		return (ApplyStereotypeAdviceConfigurationFactory)getEFactoryInstance();
+	public ApplyStereotypeAdviceFactory getApplyStereotypeAdviceFactory() {
+		return (ApplyStereotypeAdviceFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -394,7 +394,7 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		ElementtypesconfigurationsPackage theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
 
@@ -403,7 +403,7 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		applyStereotypeAdviceConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAbstractAdviceBindingConfiguration());
+		applyStereotypeAdviceConfigurationEClass.getESuperTypes().add(theElementTypesConfigurationsPackage.getAbstractAdviceBindingConfiguration());
 		listValueEClass.getESuperTypes().add(this.getFeatureValue());
 		constantValueEClass.getESuperTypes().add(this.getFeatureValue());
 		dynamicValueEClass.getESuperTypes().add(this.getFeatureValue());
@@ -439,4 +439,4 @@ public class ApplyStereotypeAdviceConfigurationPackageImpl extends EPackageImpl
 		createResource(eNS_URI);
 	}
 
-} //ApplyStereotypeAdviceConfigurationPackageImpl
+} //ApplyStereotypeAdvicePackageImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ConstantValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ConstantValueImpl.java
index 318f6e6be64..630877b7dae 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/ConstantValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ConstantValueImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue;
 
 import org.eclipse.uml2.uml.ValueSpecification;
 
@@ -33,7 +33,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ConstantValueImpl#getValueInstance <em>Value Instance</em>}</li>
  * </ul>
  *
  * @generated
@@ -65,7 +65,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE;
+		return ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE;
 	}
 
 	/**
@@ -86,7 +86,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 		ValueSpecification oldValueInstance = valueInstance;
 		valueInstance = newValueInstance;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, oldValueInstance, newValueInstance);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -101,14 +101,14 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 		if (newValueInstance != valueInstance) {
 			NotificationChain msgs = null;
 			if (valueInstance != null)
-				msgs = ((InternalEObject)valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
+				msgs = ((InternalEObject)valueInstance).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
 			if (newValueInstance != null)
-				msgs = ((InternalEObject)newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
+				msgs = ((InternalEObject)newValueInstance).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, null, msgs);
 			msgs = basicSetValueInstance(newValueInstance, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
+			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE, newValueInstance, newValueInstance));
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				return basicSetValueInstance(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -133,7 +133,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				return getValueInstance();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -147,7 +147,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				setValueInstance((ValueSpecification)newValue);
 				return;
 		}
@@ -162,7 +162,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				setValueInstance((ValueSpecification)null);
 				return;
 		}
@@ -177,7 +177,7 @@ public class ConstantValueImpl extends FeatureValueImpl implements ConstantValue
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				return valueInstance != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/DynamicValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/DynamicValueImpl.java
index 4f1696fb378..11c5eed074a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/DynamicValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/DynamicValueImpl.java
@@ -10,12 +10,12 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,7 +41,7 @@ public abstract class DynamicValueImpl extends FeatureValueImpl implements Dynam
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.DYNAMIC_VALUE;
+		return ApplyStereotypeAdvicePackage.Literals.DYNAMIC_VALUE;
 	}
 
 } //DynamicValueImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureToSetImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/FeatureToSetImpl.java
index 002a9326aca..05979ec643c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureToSetImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/FeatureToSetImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureToSetImpl#getFeatureName <em>Feature Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.FeatureToSetImpl#getValue <em>Value</em>}</li>
  * </ul>
  *
  * @generated
@@ -86,7 +86,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_TO_SET;
+		return ApplyStereotypeAdvicePackage.Literals.FEATURE_TO_SET;
 	}
 
 	/**
@@ -107,7 +107,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 		String oldFeatureName = featureName;
 		featureName = newFeatureName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.FEATURE_TO_SET__FEATURE_NAME, oldFeatureName, featureName));
 	}
 
 	/**
@@ -128,7 +128,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 		FeatureValue oldValue = value;
 		value = newValue;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, oldValue, newValue);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE, oldValue, newValue);
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
@@ -143,14 +143,14 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 		if (newValue != value) {
 			NotificationChain msgs = null;
 			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
+				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE, null, msgs);
 			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, null, msgs);
+				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE, null, msgs);
 			msgs = basicSetValue(newValue, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
 		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE, newValue, newValue));
+			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE, newValue, newValue));
 	}
 
 	/**
@@ -161,7 +161,7 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE:
 				return basicSetValue(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -175,9 +175,9 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				return getFeatureName();
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE:
 				return getValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -191,10 +191,10 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				setFeatureName((String)newValue);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE:
 				setValue((FeatureValue)newValue);
 				return;
 		}
@@ -209,10 +209,10 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				setFeatureName(FEATURE_NAME_EDEFAULT);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE:
 				setValue((FeatureValue)null);
 				return;
 		}
@@ -227,9 +227,9 @@ public class FeatureToSetImpl extends EObjectImpl implements FeatureToSet {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				return FEATURE_NAME_EDEFAULT == null ? featureName != null : !FEATURE_NAME_EDEFAULT.equals(featureName);
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE:
 				return value != null;
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/FeatureValueImpl.java
index 2f72d8b7c46..54638bd57ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/FeatureValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/FeatureValueImpl.java
@@ -10,14 +10,14 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,7 +43,7 @@ public abstract class FeatureValueImpl extends EObjectImpl implements FeatureVal
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.FEATURE_VALUE;
+		return ApplyStereotypeAdvicePackage.Literals.FEATURE_VALUE;
 	}
 
 } //FeatureValueImpl
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/ListValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ListValueImpl.java
index 295b3cdd862..ab350b04d96 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/impl/ListValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/ListValueImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import java.util.Collection;
 
@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.ListValue;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadvicec
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.impl.ListValueImpl#getValues <em>Values</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.ListValueImpl#getValues <em>Values</em>}</li>
  * </ul>
  *
  * @generated
@@ -68,7 +68,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return SetValuesAdviceConfigurationPackage.Literals.LIST_VALUE;
+		return ApplyStereotypeAdvicePackage.Literals.LIST_VALUE;
 	}
 
 	/**
@@ -78,7 +78,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	 */
 	public EList<FeatureValue> getValues() {
 		if (values == null) {
-			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES);
+			values = new EObjectContainmentEList<FeatureValue>(FeatureValue.class, this, ApplyStereotypeAdvicePackage.LIST_VALUE__VALUES);
 		}
 		return values;
 	}
@@ -91,7 +91,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case ApplyStereotypeAdvicePackage.LIST_VALUE__VALUES:
 				return ((InternalEList<?>)getValues()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -105,7 +105,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case ApplyStereotypeAdvicePackage.LIST_VALUE__VALUES:
 				return getValues();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -120,7 +120,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case ApplyStereotypeAdvicePackage.LIST_VALUE__VALUES:
 				getValues().clear();
 				getValues().addAll((Collection<? extends FeatureValue>)newValue);
 				return;
@@ -136,7 +136,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case ApplyStereotypeAdvicePackage.LIST_VALUE__VALUES:
 				getValues().clear();
 				return;
 		}
@@ -151,7 +151,7 @@ public class ListValueImpl extends FeatureValueImpl implements ListValue {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case SetValuesAdviceConfigurationPackage.LIST_VALUE__VALUES:
+			case ApplyStereotypeAdvicePackage.LIST_VALUE__VALUES:
 				return values != null && !values.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/QueryExecutionValueImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/QueryExecutionValueImpl.java
index 78a0acaa510..238b31865b8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/QueryExecutionValueImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/QueryExecutionValueImpl.java
@@ -10,12 +10,12 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,7 +41,7 @@ public class QueryExecutionValueImpl extends DynamicValueImpl implements QueryEx
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.QUERY_EXECUTION_VALUE;
+		return ApplyStereotypeAdvicePackage.Literals.QUERY_EXECUTION_VALUE;
 	}
 
 } //QueryExecutionValueImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/StereotypeToApplyImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/StereotypeToApplyImpl.java
index 36c3d0c47b9..abf896478b3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/impl/StereotypeToApplyImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/impl/StereotypeToApplyImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl;
 
 import java.util.Collection;
 
@@ -29,9 +29,9 @@ import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,10 +41,10 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#isUpdateName <em>Update Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getRequiredProfiles <em>Required Profiles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.impl.StereotypeToApplyImpl#getFeaturesToSet <em>Features To Set</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl#isUpdateName <em>Update Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl#getRequiredProfiles <em>Required Profiles</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl.StereotypeToApplyImpl#getFeaturesToSet <em>Features To Set</em>}</li>
  * </ul>
  *
  * @generated
@@ -126,7 +126,7 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return ApplyStereotypeAdviceConfigurationPackage.Literals.STEREOTYPE_TO_APPLY;
+		return ApplyStereotypeAdvicePackage.Literals.STEREOTYPE_TO_APPLY;
 	}
 
 	/**
@@ -147,7 +147,7 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 		String oldStereotypeQualifiedName = stereotypeQualifiedName;
 		stereotypeQualifiedName = newStereotypeQualifiedName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME, oldStereotypeQualifiedName, stereotypeQualifiedName));
 	}
 
 	/**
@@ -168,7 +168,7 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 		boolean oldUpdateName = updateName;
 		updateName = newUpdateName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME, oldUpdateName, updateName));
+			eNotify(new ENotificationImpl(this, Notification.SET, ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__UPDATE_NAME, oldUpdateName, updateName));
 	}
 
 	/**
@@ -178,7 +178,7 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	 */
 	public EList<String> getRequiredProfiles() {
 		if (requiredProfiles == null) {
-			requiredProfiles = new EDataTypeUniqueEList<String>(String.class, this, ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES);
+			requiredProfiles = new EDataTypeUniqueEList<String>(String.class, this, ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES);
 		}
 		return requiredProfiles;
 	}
@@ -190,7 +190,7 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	 */
 	public EList<FeatureToSet> getFeaturesToSet() {
 		if (featuresToSet == null) {
-			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET);
+			featuresToSet = new EObjectContainmentEList<FeatureToSet>(FeatureToSet.class, this, ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET);
 		}
 		return featuresToSet;
 	}
@@ -203,7 +203,7 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
 				return ((InternalEList<?>)getFeaturesToSet()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -217,13 +217,13 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
 				return getStereotypeQualifiedName();
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
 				return isUpdateName();
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
 				return getRequiredProfiles();
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
 				return getFeaturesToSet();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -238,17 +238,17 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
 				setStereotypeQualifiedName((String)newValue);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
 				setUpdateName((Boolean)newValue);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
 				getRequiredProfiles().clear();
 				getRequiredProfiles().addAll((Collection<? extends String>)newValue);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
 				getFeaturesToSet().clear();
 				getFeaturesToSet().addAll((Collection<? extends FeatureToSet>)newValue);
 				return;
@@ -264,16 +264,16 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
 				setStereotypeQualifiedName(STEREOTYPE_QUALIFIED_NAME_EDEFAULT);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
 				setUpdateName(UPDATE_NAME_EDEFAULT);
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
 				getRequiredProfiles().clear();
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
 				getFeaturesToSet().clear();
 				return;
 		}
@@ -288,13 +288,13 @@ public class StereotypeToApplyImpl extends EObjectImpl implements StereotypeToAp
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
 				return STEREOTYPE_QUALIFIED_NAME_EDEFAULT == null ? stereotypeQualifiedName != null : !STEREOTYPE_QUALIFIED_NAME_EDEFAULT.equals(stereotypeQualifiedName);
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
 				return updateName != UPDATE_NAME_EDEFAULT;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
 				return requiredProfiles != null && !requiredProfiles.isEmpty();
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
 				return featuresToSet != null && !featuresToSet.isEmpty();
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceConfigurationItemProvider.java
index e90c123c3e4..70a07b6e592 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -26,14 +26,14 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractAdviceBindingConfigurationItemProvider;
+import org.eclipse.papyrus.infra.types.provider.AbstractAdviceBindingConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -76,7 +76,7 @@ public class ApplyStereotypeAdviceConfigurationItemProvider extends AbstractAdvi
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ApplyStereotypeAdviceConfigurationPackage.Literals.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY);
+			childrenFeatures.add(ApplyStereotypeAdvicePackage.Literals.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY);
 		}
 		return childrenFeatures;
 	}
@@ -132,7 +132,7 @@ public class ApplyStereotypeAdviceConfigurationItemProvider extends AbstractAdvi
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ApplyStereotypeAdviceConfiguration.class)) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -152,8 +152,8 @@ public class ApplyStereotypeAdviceConfigurationItemProvider extends AbstractAdvi
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY,
-				 ApplyStereotypeAdviceConfigurationFactory.eINSTANCE.createStereotypeToApply()));
+				(ApplyStereotypeAdvicePackage.Literals.APPLY_STEREOTYPE_ADVICE_CONFIGURATION__STEREOTYPES_TO_APPLY,
+				 ApplyStereotypeAdviceFactory.eINSTANCE.createStereotypeToApply()));
 	}
 
 	/**
@@ -164,7 +164,7 @@ public class ApplyStereotypeAdviceConfigurationItemProvider extends AbstractAdvi
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ApplyStereotypeAdviceConfigurationEditPlugin.INSTANCE;
+		return ApplyStereotypeAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceEditPlugin.java
index 4d73df956f8..c3ee598d69d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -18,24 +18,24 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 import org.eclipse.uml2.uml.edit.UMLEditPlugin;
 
 /**
- * This is the central singleton for the ApplyStereotypeAdviceConfiguration edit plugin.
+ * This is the central singleton for the ApplyStereotypeAdvice edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public final class ApplyStereotypeAdviceConfigurationEditPlugin extends EMFPlugin {
+public final class ApplyStereotypeAdviceEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final ApplyStereotypeAdviceConfigurationEditPlugin INSTANCE = new ApplyStereotypeAdviceConfigurationEditPlugin();
+	public static final ApplyStereotypeAdviceEditPlugin INSTANCE = new ApplyStereotypeAdviceEditPlugin();
 
 	/**
 	 * Keep track of the singleton.
@@ -51,11 +51,11 @@ public final class ApplyStereotypeAdviceConfigurationEditPlugin extends EMFPlugi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationEditPlugin() {
+	public ApplyStereotypeAdviceEditPlugin() {
 		super
 		  (new ResourceLocator [] {
 		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
 		     UMLEditPlugin.INSTANCE,
 		   });
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceItemProviderAdapterFactory.java
index bd2dc9e41a9..d12d6373eff 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ApplyStereotypeAdviceItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,14 +41,14 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsSwitch;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.util.ApplyStereotypeAdviceAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -59,7 +59,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * <!-- end-user-doc -->
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extends ApplyStereotypeAdviceConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class ApplyStereotypeAdviceItemProviderAdapterFactory extends ApplyStereotypeAdviceAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -90,7 +90,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory() {
+	public ApplyStereotypeAdviceItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -99,7 +99,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -107,7 +107,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected ApplyStereotypeAdviceConfigurationItemProvider applyStereotypeAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -122,7 +122,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -130,7 +130,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected StereotypeToApplyItemProvider stereotypeToApplyItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -145,7 +145,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -153,7 +153,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected FeatureToSetItemProvider featureToSetItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -168,7 +168,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -176,7 +176,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected ListValueItemProvider listValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -191,7 +191,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -199,7 +199,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected ConstantValueItemProvider constantValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -214,7 +214,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -222,7 +222,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	protected QueryExecutionValueItemProvider queryExecutionValueItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -344,19 +344,19 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 	}
 
 	/**
-	 * A child creation extender for the {@link ElementtypesconfigurationsPackage}.
+	 * A child creation extender for the {@link ElementTypesConfigurationsPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {
+	public static class ElementTypesConfigurationsChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {
+		protected static class CreationSwitch extends ElementTypesConfigurationsSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -392,8 +392,8 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 			public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
-						 ApplyStereotypeAdviceConfigurationFactory.eINSTANCE.createApplyStereotypeAdviceConfiguration()));
+						(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+						 ApplyStereotypeAdviceFactory.eINSTANCE.createApplyStereotypeAdviceConfiguration()));
 
 				return null;
 			}
@@ -426,7 +426,7 @@ public class ApplyStereotypeAdviceConfigurationItemProviderAdapterFactory extend
 		 * @generated
 		 */
 		public ResourceLocator getResourceLocator() {
-			return ApplyStereotypeAdviceConfigurationEditPlugin.INSTANCE;
+			return ApplyStereotypeAdviceEditPlugin.INSTANCE;
 		}
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ConstantValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ConstantValueItemProvider.java
index 3ff0b320a52..128284d64bc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ConstantValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ConstantValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -24,13 +24,13 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue;
 
 import org.eclipse.uml2.uml.UMLFactory;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -73,7 +73,7 @@ public class ConstantValueItemProvider extends FeatureValueItemProvider {
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE);
+			childrenFeatures.add(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE);
 		}
 		return childrenFeatures;
 	}
@@ -126,7 +126,7 @@ public class ConstantValueItemProvider extends FeatureValueItemProvider {
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ConstantValue.class)) {
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE__VALUE_INSTANCE:
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE__VALUE_INSTANCE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -146,77 +146,77 @@ public class ConstantValueItemProvider extends FeatureValueItemProvider {
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createOpaqueExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createStringExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createInstanceValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createTimeExpression()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createDuration()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createInterval()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createDurationInterval()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralBoolean()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralInteger()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralNull()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralReal()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralString()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createLiteralUnlimitedNatural()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
+				(ApplyStereotypeAdvicePackage.Literals.CONSTANT_VALUE__VALUE_INSTANCE,
 				 UMLFactory.eINSTANCE.createTimeInterval()));
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/DynamicValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/DynamicValueItemProvider.java
index ef091c995b4..2da60d47a16 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/DynamicValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/DynamicValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/FeatureToSetItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureToSetItemProvider.java
index 3eae3f7c0b8..77da132b54f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/FeatureToSetItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureToSetItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -34,12 +34,12 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.SetValuesAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.FeatureToSet} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -91,7 +91,7 @@ public class FeatureToSetItemProvider
 				 getResourceLocator(),
 				 getString("_UI_FeatureToSet_featureName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureToSet_featureName_feature", "_UI_FeatureToSet_type"),
-				 SetValuesAdviceConfigurationPackage.Literals.FEATURE_TO_SET__FEATURE_NAME,
+				 ApplyStereotypeAdvicePackage.Literals.FEATURE_TO_SET__FEATURE_NAME,
 				 true,
 				 false,
 				 false,
@@ -112,7 +112,7 @@ public class FeatureToSetItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(SetValuesAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE);
+			childrenFeatures.add(ApplyStereotypeAdvicePackage.Literals.FEATURE_TO_SET__VALUE);
 		}
 		return childrenFeatures;
 	}
@@ -168,10 +168,10 @@ public class FeatureToSetItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(FeatureToSet.class)) {
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__FEATURE_NAME:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__FEATURE_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case SetValuesAdviceConfigurationPackage.FEATURE_TO_SET__VALUE:
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET__VALUE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -191,18 +191,18 @@ public class FeatureToSetItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createConstantValue()));
+				(ApplyStereotypeAdvicePackage.Literals.FEATURE_TO_SET__VALUE,
+				 ApplyStereotypeAdviceFactory.eINSTANCE.createListValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createListValue()));
+				(ApplyStereotypeAdvicePackage.Literals.FEATURE_TO_SET__VALUE,
+				 ApplyStereotypeAdviceFactory.eINSTANCE.createConstantValue()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(SetValuesAdviceConfigurationPackage.Literals.FEATURE_TO_SET__VALUE,
-				 SetValuesAdviceConfigurationFactory.eINSTANCE.createQueryExecutionValue()));
+				(ApplyStereotypeAdvicePackage.Literals.FEATURE_TO_SET__VALUE,
+				 ApplyStereotypeAdviceFactory.eINSTANCE.createQueryExecutionValue()));
 	}
 
 	/**
@@ -213,7 +213,7 @@ public class FeatureToSetItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return SetValuesAdviceConfigurationEditPlugin.INSTANCE;
+		return ApplyStereotypeAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureValueItemProvider.java
index 9dc77ee51ee..6a1de060156 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/FeatureValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/FeatureValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -113,7 +113,7 @@ public class FeatureValueItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ApplyStereotypeAdviceConfigurationEditPlugin.INSTANCE;
+		return ApplyStereotypeAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ListValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ListValueItemProvider.java
index 9216e8e80c3..06939be01cb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/ListValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/ListValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -22,10 +22,10 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -70,7 +70,7 @@ public class ListValueItemProvider extends FeatureValueItemProvider {
 				 getResourceLocator(),
 				 getString("_UI_ListValue_values_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ListValue_values_feature", "_UI_ListValue_type"),
-				 ApplyStereotypeAdviceConfigurationPackage.Literals.LIST_VALUE__VALUES,
+				 ApplyStereotypeAdvicePackage.Literals.LIST_VALUE__VALUES,
 				 true,
 				 false,
 				 true,
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/QueryExecutionValueItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/QueryExecutionValueItemProvider.java
index df6bc8c5279..c0ae9410f63 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/provider/QueryExecutionValueItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/QueryExecutionValueItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.QueryExecutionValue} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/StereotypeToApplyItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/StereotypeToApplyItemProvider.java
index 375cb4a7f8c..f95a94df4f7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/provider/StereotypeToApplyItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/provider/StereotypeToApplyItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.provider;
 
 
 import java.util.Collection;
@@ -34,12 +34,12 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceFactory;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -93,7 +93,7 @@ public class StereotypeToApplyItemProvider
 				 getResourceLocator(),
 				 getString("_UI_StereotypeToApply_stereotypeQualifiedName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypeToApply_stereotypeQualifiedName_feature", "_UI_StereotypeToApply_type"),
-				 ApplyStereotypeAdviceConfigurationPackage.Literals.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME,
+				 ApplyStereotypeAdvicePackage.Literals.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME,
 				 true,
 				 false,
 				 false,
@@ -115,7 +115,7 @@ public class StereotypeToApplyItemProvider
 				 getResourceLocator(),
 				 getString("_UI_StereotypeToApply_updateName_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypeToApply_updateName_feature", "_UI_StereotypeToApply_type"),
-				 ApplyStereotypeAdviceConfigurationPackage.Literals.STEREOTYPE_TO_APPLY__UPDATE_NAME,
+				 ApplyStereotypeAdvicePackage.Literals.STEREOTYPE_TO_APPLY__UPDATE_NAME,
 				 true,
 				 false,
 				 false,
@@ -137,7 +137,7 @@ public class StereotypeToApplyItemProvider
 				 getResourceLocator(),
 				 getString("_UI_StereotypeToApply_requiredProfiles_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypeToApply_requiredProfiles_feature", "_UI_StereotypeToApply_type"),
-				 ApplyStereotypeAdviceConfigurationPackage.Literals.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES,
+				 ApplyStereotypeAdvicePackage.Literals.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES,
 				 true,
 				 false,
 				 false,
@@ -158,7 +158,7 @@ public class StereotypeToApplyItemProvider
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ApplyStereotypeAdviceConfigurationPackage.Literals.STEREOTYPE_TO_APPLY__FEATURES_TO_SET);
+			childrenFeatures.add(ApplyStereotypeAdvicePackage.Literals.STEREOTYPE_TO_APPLY__FEATURES_TO_SET);
 		}
 		return childrenFeatures;
 	}
@@ -214,12 +214,12 @@ public class StereotypeToApplyItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(StereotypeToApply.class)) {
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__STEREOTYPE_QUALIFIED_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__UPDATE_NAME:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__REQUIRED_PROFILES:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY__FEATURES_TO_SET:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -239,8 +239,8 @@ public class StereotypeToApplyItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ApplyStereotypeAdviceConfigurationPackage.Literals.STEREOTYPE_TO_APPLY__FEATURES_TO_SET,
-				 ApplyStereotypeAdviceConfigurationFactory.eINSTANCE.createFeatureToSet()));
+				(ApplyStereotypeAdvicePackage.Literals.STEREOTYPE_TO_APPLY__FEATURES_TO_SET,
+				 ApplyStereotypeAdviceFactory.eINSTANCE.createFeatureToSet()));
 	}
 
 	/**
@@ -251,7 +251,7 @@ public class StereotypeToApplyItemProvider
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return ApplyStereotypeAdviceConfigurationEditPlugin.INSTANCE;
+		return ApplyStereotypeAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceAdapterFactory.java
index 01046bac0e6..bff9f19f793 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,29 +19,29 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl {
+public class ApplyStereotypeAdviceAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static ApplyStereotypeAdviceConfigurationPackage modelPackage;
+	protected static ApplyStereotypeAdvicePackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -49,9 +49,9 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationAdapterFactory() {
+	public ApplyStereotypeAdviceAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = ApplyStereotypeAdviceConfigurationPackage.eINSTANCE;
+			modelPackage = ApplyStereotypeAdvicePackage.eINSTANCE;
 		}
 	}
 
@@ -80,8 +80,8 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ApplyStereotypeAdviceConfigurationSwitch<Adapter> modelSwitch =
-		new ApplyStereotypeAdviceConfigurationSwitch<Adapter>() {
+	protected ApplyStereotypeAdviceSwitch<Adapter> modelSwitch =
+		new ApplyStereotypeAdviceSwitch<Adapter>() {
 			@Override
 			public Adapter caseApplyStereotypeAdviceConfiguration(ApplyStereotypeAdviceConfiguration object) {
 				return createApplyStereotypeAdviceConfigurationAdapter();
@@ -151,13 +151,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration <em>Apply Stereotype Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createApplyStereotypeAdviceConfigurationAdapter() {
@@ -165,13 +165,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply <em>Stereotype To Apply</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply <em>Stereotype To Apply</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.StereotypeToApply
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.StereotypeToApply
 	 * @generated
 	 */
 	public Adapter createStereotypeToApplyAdapter() {
@@ -179,13 +179,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet <em>Feature To Set</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet <em>Feature To Set</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureToSet
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureToSet
 	 * @generated
 	 */
 	public Adapter createFeatureToSetAdapter() {
@@ -193,13 +193,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue <em>Feature Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue <em>Feature Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.FeatureValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.FeatureValue
 	 * @generated
 	 */
 	public Adapter createFeatureValueAdapter() {
@@ -207,13 +207,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue <em>List Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue <em>List Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ListValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ListValue
 	 * @generated
 	 */
 	public Adapter createListValueAdapter() {
@@ -221,13 +221,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue <em>Constant Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue <em>Constant Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ConstantValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ConstantValue
 	 * @generated
 	 */
 	public Adapter createConstantValueAdapter() {
@@ -235,13 +235,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue <em>Dynamic Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue <em>Dynamic Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.DynamicValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.DynamicValue
 	 * @generated
 	 */
 	public Adapter createDynamicValueAdapter() {
@@ -249,13 +249,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue <em>Query Execution Value</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue <em>Query Execution Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.QueryExecutionValue
+	 * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.QueryExecutionValue
 	 * @generated
 	 */
 	public Adapter createQueryExecutionValueAdapter() {
@@ -263,13 +263,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	public Adapter createConfigurationElementAdapter() {
@@ -277,13 +277,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration <em>Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration <em>Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createAdviceConfigurationAdapter() {
@@ -291,13 +291,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	public Adapter createIdentifiedConfigurationAdapter() {
@@ -305,13 +305,13 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractAdviceBindingConfigurationAdapter() {
@@ -330,4 +330,4 @@ public class ApplyStereotypeAdviceConfigurationAdapterFactory extends AdapterFac
 		return null;
 	}
 
-} //ApplyStereotypeAdviceConfigurationAdapterFactory
+} //ApplyStereotypeAdviceAdapterFactory
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceResourceFactoryImpl.java
new file mode 100644
index 00000000000..9b6478b6dec
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceResourceFactoryImpl.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.util.ApplyStereotypeAdviceResourceImpl
+ * @generated
+ */
+public class ApplyStereotypeAdviceResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ApplyStereotypeAdviceResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new ApplyStereotypeAdviceResourceImpl(uri);
+		return result;
+	}
+
+} //ApplyStereotypeAdviceResourceFactoryImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceResourceImpl.java
index 333f1b7ddf4..6986b5a64b4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationResourceImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.util.ApplyStereotypeAdviceResourceFactoryImpl
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationResourceImpl extends XMLResourceImpl {
+public class ApplyStereotypeAdviceResourceImpl extends XMLResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
@@ -31,8 +31,8 @@ public class ApplyStereotypeAdviceConfigurationResourceImpl extends XMLResourceI
 	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationResourceImpl(URI uri) {
+	public ApplyStereotypeAdviceResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //ApplyStereotypeAdviceConfigurationResourceImpl
+} //ApplyStereotypeAdviceResourceImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceSwitch.java
index 60c2ac6ae82..47167df0a99 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceSwitch.java
@@ -10,19 +10,19 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,17 +34,17 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
+public class ApplyStereotypeAdviceSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static ApplyStereotypeAdviceConfigurationPackage modelPackage;
+	protected static ApplyStereotypeAdvicePackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -52,9 +52,9 @@ public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationSwitch() {
+	public ApplyStereotypeAdviceSwitch() {
 		if (modelPackage == null) {
-			modelPackage = ApplyStereotypeAdviceConfigurationPackage.eINSTANCE;
+			modelPackage = ApplyStereotypeAdvicePackage.eINSTANCE;
 		}
 	}
 
@@ -81,7 +81,7 @@ public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case ApplyStereotypeAdviceConfigurationPackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION: {
+			case ApplyStereotypeAdvicePackage.APPLY_STEREOTYPE_ADVICE_CONFIGURATION: {
 				ApplyStereotypeAdviceConfiguration applyStereotypeAdviceConfiguration = (ApplyStereotypeAdviceConfiguration)theEObject;
 				T result = caseApplyStereotypeAdviceConfiguration(applyStereotypeAdviceConfiguration);
 				if (result == null) result = caseAbstractAdviceBindingConfiguration(applyStereotypeAdviceConfiguration);
@@ -91,46 +91,46 @@ public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.STEREOTYPE_TO_APPLY: {
+			case ApplyStereotypeAdvicePackage.STEREOTYPE_TO_APPLY: {
 				StereotypeToApply stereotypeToApply = (StereotypeToApply)theEObject;
 				T result = caseStereotypeToApply(stereotypeToApply);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_TO_SET: {
+			case ApplyStereotypeAdvicePackage.FEATURE_TO_SET: {
 				FeatureToSet featureToSet = (FeatureToSet)theEObject;
 				T result = caseFeatureToSet(featureToSet);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.FEATURE_VALUE: {
+			case ApplyStereotypeAdvicePackage.FEATURE_VALUE: {
 				FeatureValue featureValue = (FeatureValue)theEObject;
 				T result = caseFeatureValue(featureValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.LIST_VALUE: {
+			case ApplyStereotypeAdvicePackage.LIST_VALUE: {
 				ListValue listValue = (ListValue)theEObject;
 				T result = caseListValue(listValue);
 				if (result == null) result = caseFeatureValue(listValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.CONSTANT_VALUE: {
+			case ApplyStereotypeAdvicePackage.CONSTANT_VALUE: {
 				ConstantValue constantValue = (ConstantValue)theEObject;
 				T result = caseConstantValue(constantValue);
 				if (result == null) result = caseFeatureValue(constantValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.DYNAMIC_VALUE: {
+			case ApplyStereotypeAdvicePackage.DYNAMIC_VALUE: {
 				DynamicValue dynamicValue = (DynamicValue)theEObject;
 				T result = caseDynamicValue(dynamicValue);
 				if (result == null) result = caseFeatureValue(dynamicValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case ApplyStereotypeAdviceConfigurationPackage.QUERY_EXECUTION_VALUE: {
+			case ApplyStereotypeAdvicePackage.QUERY_EXECUTION_VALUE: {
 				QueryExecutionValue queryExecutionValue = (QueryExecutionValue)theEObject;
 				T result = caseQueryExecutionValue(queryExecutionValue);
 				if (result == null) result = caseDynamicValue(queryExecutionValue);
@@ -143,13 +143,13 @@ public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Apply Stereotype Advice Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Apply Stereotype Advice Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -338,4 +338,4 @@ public class ApplyStereotypeAdviceConfigurationSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //ApplyStereotypeAdviceConfigurationSwitch
+} //ApplyStereotypeAdviceSwitch
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationXMLProcessor.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceXMLProcessor.java
index e18d7dba47e..1a2dd24a74e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/util/ApplyStereotypeAdviceConfigurationXMLProcessor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/applystereotype/util/ApplyStereotypeAdviceXMLProcessor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.advices.applystereotype.util;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdvicePackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadvicec
  * <!-- end-user-doc -->
  * @generated
  */
-public class ApplyStereotypeAdviceConfigurationXMLProcessor extends XMLProcessor {
+public class ApplyStereotypeAdviceXMLProcessor extends XMLProcessor {
 
 	/**
 	 * Public constructor to instantiate the helper.
@@ -36,13 +36,13 @@ public class ApplyStereotypeAdviceConfigurationXMLProcessor extends XMLProcessor
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ApplyStereotypeAdviceConfigurationXMLProcessor() {
+	public ApplyStereotypeAdviceXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
-		ApplyStereotypeAdviceConfigurationPackage.eINSTANCE.eClass();
+		ApplyStereotypeAdvicePackage.eINSTANCE.eClass();
 	}
 	
 	/**
-	 * Register for "*" and "xml" file extensions the ApplyStereotypeAdviceConfigurationResourceFactoryImpl factory.
+	 * Register for "*" and "xml" file extensions the ApplyStereotypeAdviceResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -51,10 +51,10 @@ public class ApplyStereotypeAdviceConfigurationXMLProcessor extends XMLProcessor
 	protected Map<String, Resource.Factory> getRegistrations() {
 		if (registrations == null) {
 			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new ApplyStereotypeAdviceConfigurationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new ApplyStereotypeAdviceConfigurationResourceFactoryImpl());
+			registrations.put(XML_EXTENSION, new ApplyStereotypeAdviceResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new ApplyStereotypeAdviceResourceFactoryImpl());
 		}
 		return registrations;
 	}
 
-} //ApplyStereotypeAdviceConfigurationXMLProcessor
+} //ApplyStereotypeAdviceXMLProcessor
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfiguration.java
index 676976b5fef..c4859c0e130 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfiguration.java
@@ -10,11 +10,11 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.settype;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,11 +25,11 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindin
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration()
+ * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration()
  * @model
  * @generated
  */
@@ -44,7 +44,7 @@ public interface SetTypeAdviceConfiguration extends AbstractAdviceBindingConfigu
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Valid Types</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_ValidTypes()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_ValidTypes()
 	 * @model
 	 * @generated
 	 */
@@ -60,7 +60,7 @@ public interface SetTypeAdviceConfiguration extends AbstractAdviceBindingConfigu
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Creation Types</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_CreationTypes()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage#getSetTypeAdviceConfiguration_CreationTypes()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationFactory.java
index 4c391391d5d..81c98bedff2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.settype;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage
  * @generated
  */
 public interface SetTypeAdviceConfigurationFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface SetTypeAdviceConfigurationFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	SetTypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationFactoryImpl.init();
+	SetTypeAdviceConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Set Type Advice Configuration</em>'.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationPackage.java
index e565c9eaee7..7d6b093cc81 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceConfigurationPackage.java
@@ -10,13 +10,13 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
+package org.eclipse.papyrus.uml.types.core.advices.settype;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory
+ * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationFactory
  * @model kind="package"
  * @generated
  */
@@ -41,7 +41,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "settypeadviceconfiguration";
+	String eNAME = "settype";
 
 	/**
 	 * The package namespace URI.
@@ -49,7 +49,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/settypeadvice/1.1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/uml/types/settypeadvice/1.1";
 
 	/**
 	 * The package namespace name.
@@ -57,7 +57,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "settypeadviceconfiguration";
+	String eNS_PREFIX = "settypeadvice";
 
 	/**
 	 * The singleton instance of the package.
@@ -65,14 +65,14 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	SetTypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl.init();
+	SetTypeAdviceConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
 	 * @generated
 	 */
 	int SET_TYPE_ADVICE_CONFIGURATION = 0;
@@ -84,7 +84,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__DESCRIPTION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
+	int SET_TYPE_ADVICE_CONFIGURATION__DESCRIPTION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__DESCRIPTION;
 
 	/**
 	 * The feature id for the '<em><b>Before</b></em>' attribute list.
@@ -93,7 +93,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__BEFORE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
+	int SET_TYPE_ADVICE_CONFIGURATION__BEFORE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__BEFORE;
 
 	/**
 	 * The feature id for the '<em><b>After</b></em>' attribute list.
@@ -102,7 +102,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__AFTER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
+	int SET_TYPE_ADVICE_CONFIGURATION__AFTER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__AFTER;
 
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
@@ -111,7 +111,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__IDENTIFIER = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
+	int SET_TYPE_ADVICE_CONFIGURATION__IDENTIFIER = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__IDENTIFIER;
 
 	/**
 	 * The feature id for the '<em><b>Target</b></em>' reference.
@@ -120,7 +120,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__TARGET = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
+	int SET_TYPE_ADVICE_CONFIGURATION__TARGET = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__TARGET;
 
 	/**
 	 * The feature id for the '<em><b>Container Configuration</b></em>' containment reference.
@@ -129,7 +129,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
+	int SET_TYPE_ADVICE_CONFIGURATION__CONTAINER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__CONTAINER_CONFIGURATION;
 
 	/**
 	 * The feature id for the '<em><b>Matcher Configuration</b></em>' containment reference.
@@ -138,7 +138,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
+	int SET_TYPE_ADVICE_CONFIGURATION__MATCHER_CONFIGURATION = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION;
 
 	/**
 	 * The feature id for the '<em><b>Inheritance</b></em>' attribute.
@@ -147,7 +147,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__INHERITANCE = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
+	int SET_TYPE_ADVICE_CONFIGURATION__INHERITANCE = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION__INHERITANCE;
 
 	/**
 	 * The feature id for the '<em><b>Valid Types</b></em>' attribute list.
@@ -156,7 +156,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__VALID_TYPES = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
+	int SET_TYPE_ADVICE_CONFIGURATION__VALID_TYPES = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Creation Types</b></em>' attribute list.
@@ -165,7 +165,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION__CREATION_TYPES = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
+	int SET_TYPE_ADVICE_CONFIGURATION__CREATION_TYPES = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Set Type Advice Configuration</em>' class.
@@ -174,7 +174,7 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 2;
+	int SET_TYPE_ADVICE_CONFIGURATION_FEATURE_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of operations of the '<em>Set Type Advice Configuration</em>' class.
@@ -183,36 +183,36 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int SET_TYPE_ADVICE_CONFIGURATION_OPERATION_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT + 0;
+	int SET_TYPE_ADVICE_CONFIGURATION_OPERATION_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_ADVICE_BINDING_CONFIGURATION_OPERATION_COUNT + 0;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Set Type Advice Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration
 	 * @generated
 	 */
 	EClass getSetTypeAdviceConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration#getValidTypes <em>Valid Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Valid Types</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getValidTypes()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration#getValidTypes()
 	 * @see #getSetTypeAdviceConfiguration()
 	 * @generated
 	 */
 	EAttribute getSetTypeAdviceConfiguration_ValidTypes();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration#getCreationTypes <em>Creation Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Creation Types</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration#getCreationTypes()
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration#getCreationTypes()
 	 * @see #getSetTypeAdviceConfiguration()
 	 * @generated
 	 */
@@ -242,11 +242,11 @@ public interface SetTypeAdviceConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationImpl <em>Set Type Advice Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
+		 * @see org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationPackageImpl#getSetTypeAdviceConfiguration()
 		 * @generated
 		 */
 		EClass SET_TYPE_ADVICE_CONFIGURATION = eINSTANCE.getSetTypeAdviceConfiguration();
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/impl/SetTypeAdviceConfigurationFactoryImpl.java
index 4820813fb00..594baea921e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/impl/SetTypeAdviceConfigurationFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.settype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.advices.settype.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/impl/SetTypeAdviceConfigurationImpl.java
index 906dc64ec3c..d6ccf431f33 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/impl/SetTypeAdviceConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.settype.impl;
 
 import java.util.Collection;
 
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractAdviceBindingConfigurationImpl;
+import org.eclipse.papyrus.infra.types.impl.AbstractAdviceBindingConfigurationImpl;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfigura
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl#getValidTypes <em>Valid Types</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl.SetTypeAdviceConfigurationImpl#getCreationTypes <em>Creation Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationImpl#getValidTypes <em>Valid Types</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.advices.settype.impl.SetTypeAdviceConfigurationImpl#getCreationTypes <em>Creation Types</em>}</li>
  * </ul>
  *
  * @generated
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/impl/SetTypeAdviceConfigurationPackageImpl.java
index fa472a7ee8e..10260bff21a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/impl/SetTypeAdviceConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/impl/SetTypeAdviceConfigurationPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.advices.settype.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -19,11 +19,11 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,7 +50,7 @@ public class SetTypeAdviceConfigurationPackageImpl extends EPackageImpl implemen
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -87,7 +87,7 @@ public class SetTypeAdviceConfigurationPackageImpl extends EPackageImpl implemen
 
 		// Initialize simple dependencies
 		EcorePackage.eINSTANCE.eClass();
-		ElementtypesconfigurationsPackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theSetTypeAdviceConfigurationPackage.createPackageContents();
@@ -188,7 +188,7 @@ public class SetTypeAdviceConfigurationPackageImpl extends EPackageImpl implemen
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		ElementtypesconfigurationsPackage theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Create type parameters
@@ -196,7 +196,7 @@ public class SetTypeAdviceConfigurationPackageImpl extends EPackageImpl implemen
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		setTypeAdviceConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAbstractAdviceBindingConfiguration());
+		setTypeAdviceConfigurationEClass.getESuperTypes().add(theElementTypesConfigurationsPackage.getAbstractAdviceBindingConfiguration());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(setTypeAdviceConfigurationEClass, SetTypeAdviceConfiguration.class, "SetTypeAdviceConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceConfigurationItemProvider.java
index 0388156db0d..ae458b41e1c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.settype.provider;
 
 
 import java.util.Collection;
@@ -26,13 +26,13 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractAdviceBindingConfigurationItemProvider;
+import org.eclipse.papyrus.infra.types.provider.AbstractAdviceBindingConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -175,7 +175,7 @@ public class SetTypeAdviceConfigurationItemProvider extends AbstractAdviceBindin
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return SetTypeAdviceConfigurationEditPlugin.INSTANCE;
+		return SetTypeAdviceEditPlugin.INSTANCE;
 	}
 
 }
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java
index ef569f1801a..53b63c21423 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceConfigurationItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.advices.settype.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,14 +41,14 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsSwitch;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationFactory;
+import org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationFactory;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util.SetTypeAdviceConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.types.core.advices.settype.util.SetTypeAdviceConfigurationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -99,7 +99,7 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -107,7 +107,7 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 	protected SetTypeAdviceConfigurationItemProvider setTypeAdviceConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -224,19 +224,19 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 	}
 
 	/**
-	 * A child creation extender for the {@link ElementtypesconfigurationsPackage}.
+	 * A child creation extender for the {@link ElementTypesConfigurationsPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {
+	public static class ElementTypesConfigurationsChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {
+		protected static class CreationSwitch extends ElementTypesConfigurationsSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -272,7 +272,7 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 			public Object caseElementTypeSetConfiguration(ElementTypeSetConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
+						(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION__ADVICE_BINDINGS_CONFIGURATIONS,
 						 SetTypeAdviceConfigurationFactory.eINSTANCE.createSetTypeAdviceConfiguration()));
 
 				return null;
@@ -306,7 +306,7 @@ public class SetTypeAdviceConfigurationItemProviderAdapterFactory extends SetTyp
 		 * @generated
 		 */
 		public ResourceLocator getResourceLocator() {
-			return SetTypeAdviceConfigurationEditPlugin.INSTANCE;
+			return SetTypeAdviceEditPlugin.INSTANCE;
 		}
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceEditPlugin.java
new file mode 100644
index 00000000000..64d1fe70af1
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/provider/SetTypeAdviceEditPlugin.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ * 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.types.core.advices.settype.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
+
+/**
+ * This is the central singleton for the SetTypeAdvice edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class SetTypeAdviceEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final SetTypeAdviceEditPlugin INSTANCE = new SetTypeAdviceEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SetTypeAdviceEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     EcoreEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/util/SetTypeAdviceConfigurationAdapterFactory.java
index 6c0908a577b..83fd46391ad 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/util/SetTypeAdviceConfigurationAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.advices.settype.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,19 +19,19 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.advices.settype.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage
  * @generated
  */
 public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl {
@@ -123,13 +123,13 @@ public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration <em>Set Type Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfiguration
+	 * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createSetTypeAdviceConfigurationAdapter() {
@@ -137,13 +137,13 @@ public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement <em>Configuration Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.ConfigurationElement <em>Configuration Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement
+	 * @see org.eclipse.papyrus.infra.types.ConfigurationElement
 	 * @generated
 	 */
 	public Adapter createConfigurationElementAdapter() {
@@ -151,13 +151,13 @@ public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration <em>Advice Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AdviceConfiguration <em>Advice Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AdviceConfiguration
 	 * @generated
 	 */
 	public Adapter createAdviceConfigurationAdapter() {
@@ -165,13 +165,13 @@ public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration <em>Identified Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.IdentifiedConfiguration <em>Identified Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration
+	 * @see org.eclipse.papyrus.infra.types.IdentifiedConfiguration
 	 * @generated
 	 */
 	public Adapter createIdentifiedConfigurationAdapter() {
@@ -179,13 +179,13 @@ public class SetTypeAdviceConfigurationAdapterFactory extends AdapterFactoryImpl
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration <em>Abstract Advice Binding Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractAdviceBindingConfigurationAdapter() {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/util/SetTypeAdviceConfigurationSwitch.java
index d9b6eeb3985..59e22caf40d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/util/SetTypeAdviceConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/advices/settype/util/SetTypeAdviceConfigurationSwitch.java
@@ -10,19 +10,19 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.advices.settype.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AdviceConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ConfigurationElement;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IdentifiedConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AdviceConfiguration;
+import org.eclipse.papyrus.infra.types.ConfigurationElement;
+import org.eclipse.papyrus.infra.types.IdentifiedConfiguration;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.advices.settype.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,7 +34,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfigura
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration.SetTypeAdviceConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.advices.settype.SetTypeAdviceConfigurationPackage
  * @generated
  */
 public class SetTypeAdviceConfigurationSwitch<T> extends Switch<T> {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherConfiguration.java
index 8dfbed9ffe4..403f83c3ce2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherConfiguration.java
@@ -10,26 +10,26 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Stereotype Application Matcher Configuration</b></em>'.
+ * A representation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  *
  * <p>
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration()
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage#getStereotypeApplicationMatcherConfiguration()
  * @model
  * @generated
  */
@@ -44,7 +44,7 @@ public interface StereotypeApplicationMatcherConfiguration extends AbstractMatch
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotypes Qualified Names</em>' attribute list.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration_StereotypesQualifiedNames()
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage#getStereotypeApplicationMatcherConfiguration_StereotypesQualifiedNames()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -60,14 +60,14 @@ public interface StereotypeApplicationMatcherConfiguration extends AbstractMatch
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Profile Uri</em>' attribute.
 	 * @see #setProfileUri(String)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#getStereotypeApplicationMatcherConfiguration_ProfileUri()
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage#getStereotypeApplicationMatcherConfiguration_ProfileUri()
 	 * @model
 	 * @generated
 	 */
 	String getProfileUri();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Profile Uri</em>' attribute.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherFactory.java
index 7b9cd71ef7b..09ae893d763 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,23 +19,23 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage
  * @generated
  */
-public interface StereotypeApplicationMatcherConfigurationFactory extends EFactory {
+public interface StereotypeApplicationMatcherFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	StereotypeApplicationMatcherConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationFactoryImpl.init();
+	StereotypeApplicationMatcherFactory eINSTANCE = org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Stereotype Application Matcher Configuration</em>'.
+	 * Returns a new object of class '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Stereotype Application Matcher Configuration</em>'.
+	 * @return a new object of class '<em>Configuration</em>'.
 	 * @generated
 	 */
 	StereotypeApplicationMatcherConfiguration createStereotypeApplicationMatcherConfiguration();
@@ -47,6 +47,6 @@ public interface StereotypeApplicationMatcherConfigurationFactory extends EFacto
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	StereotypeApplicationMatcherConfigurationPackage getStereotypeApplicationMatcherConfigurationPackage();
+	StereotypeApplicationMatcherPackage getStereotypeApplicationMatcherPackage();
 
-} //StereotypeApplicationMatcherConfigurationFactory
+} //StereotypeApplicationMatcherFactory
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherPackage.java
index fb569dc677e..1e25140e001 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherPackage.java
@@ -10,13 +10,13 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,18 +30,18 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.Elementtypesconfigur
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherFactory
  * @model kind="package"
  * @generated
  */
-public interface StereotypeApplicationMatcherConfigurationPackage extends EPackage {
+public interface StereotypeApplicationMatcherPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "stereotypeapplicationmatcherconfiguration";
+	String eNAME = "stereotype";
 
 	/**
 	 * The package namespace URI.
@@ -49,7 +49,7 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1";
 
 	/**
 	 * The package namespace name.
@@ -57,7 +57,7 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "stereotypeapplicationmatcherconfiguration";
+	String eNS_PREFIX = "stereotypematcher";
 
 	/**
 	 * The singleton instance of the package.
@@ -65,14 +65,14 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	StereotypeApplicationMatcherConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl.init();
+	StereotypeApplicationMatcherPackage eINSTANCE = org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl <em>Stereotype Application Matcher Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl#getStereotypeApplicationMatcherConfiguration()
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherPackageImpl#getStereotypeApplicationMatcherConfiguration()
 	 * @generated
 	 */
 	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION = 0;
@@ -84,7 +84,7 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES = ElementtypesconfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT + 0;
+	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Profile Uri</b></em>' attribute.
@@ -93,54 +93,54 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI = ElementtypesconfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT + 1;
+	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Stereotype Application Matcher Configuration</em>' class.
+	 * The number of structural features of the '<em>Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION_FEATURE_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT + 2;
+	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION_FEATURE_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of operations of the '<em>Stereotype Application Matcher Configuration</em>' class.
+	 * The number of operations of the '<em>Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION_OPERATION_COUNT = ElementtypesconfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT + 0;
+	int STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION_OPERATION_COUNT = ElementTypesConfigurationsPackage.ABSTRACT_MATCHER_CONFIGURATION_OPERATION_COUNT + 0;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration <em>Stereotype Application Matcher Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Stereotype Application Matcher Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration
+	 * @return the meta object for class '<em>Configuration</em>'.
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration
 	 * @generated
 	 */
 	EClass getStereotypeApplicationMatcherConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}'.
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Stereotypes Qualified Names</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames()
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getStereotypesQualifiedNames()
 	 * @see #getStereotypeApplicationMatcherConfiguration()
 	 * @generated
 	 */
 	EAttribute getStereotypeApplicationMatcherConfiguration_StereotypesQualifiedNames();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getProfileUri <em>Profile Uri</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Profile Uri</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration#getProfileUri()
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration#getProfileUri()
 	 * @see #getStereotypeApplicationMatcherConfiguration()
 	 * @generated
 	 */
@@ -153,7 +153,7 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	StereotypeApplicationMatcherConfigurationFactory getStereotypeApplicationMatcherConfigurationFactory();
+	StereotypeApplicationMatcherFactory getStereotypeApplicationMatcherFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -170,11 +170,11 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl <em>Stereotype Application Matcher Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationPackageImpl#getStereotypeApplicationMatcherConfiguration()
+		 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherPackageImpl#getStereotypeApplicationMatcherConfiguration()
 		 * @generated
 		 */
 		EClass STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION = eINSTANCE.getStereotypeApplicationMatcherConfiguration();
@@ -197,4 +197,4 @@ public interface StereotypeApplicationMatcherConfigurationPackage extends EPacka
 
 	}
 
-} //StereotypeApplicationMatcherConfigurationPackage
+} //StereotypeApplicationMatcherPackage
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeApplicationMatcherConfigurationImpl.java
index e22db10c9fb..168abf4d379 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeApplicationMatcherConfigurationImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl;
 
 import java.util.Collection;
 
@@ -24,21 +24,21 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.AbstractMatcherConfigurationImpl;
+import org.eclipse.papyrus.infra.types.impl.AbstractMatcherConfigurationImpl;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Stereotype Application Matcher Configuration</b></em>'.
+ * An implementation of the model object '<em><b>Configuration</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl.StereotypeApplicationMatcherConfigurationImpl#getProfileUri <em>Profile Uri</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherConfigurationImpl#getStereotypesQualifiedNames <em>Stereotypes Qualified Names</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl.StereotypeApplicationMatcherConfigurationImpl#getProfileUri <em>Profile Uri</em>}</li>
  * </ul>
  *
  * @generated
@@ -90,7 +90,7 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return StereotypeApplicationMatcherConfigurationPackage.Literals.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION;
+		return StereotypeApplicationMatcherPackage.Literals.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION;
 	}
 
 	/**
@@ -100,7 +100,7 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 	 */
 	public EList<String> getStereotypesQualifiedNames() {
 		if (stereotypesQualifiedNames == null) {
-			stereotypesQualifiedNames = new EDataTypeUniqueEList<String>(String.class, this, StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES);
+			stereotypesQualifiedNames = new EDataTypeUniqueEList<String>(String.class, this, StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES);
 		}
 		return stereotypesQualifiedNames;
 	}
@@ -123,7 +123,7 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 		String oldProfileUri = profileUri;
 		profileUri = newProfileUri;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI, oldProfileUri, profileUri));
+			eNotify(new ENotificationImpl(this, Notification.SET, StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI, oldProfileUri, profileUri));
 	}
 
 	/**
@@ -134,9 +134,9 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
 				return getStereotypesQualifiedNames();
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
 				return getProfileUri();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -151,11 +151,11 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
 				getStereotypesQualifiedNames().clear();
 				getStereotypesQualifiedNames().addAll((Collection<? extends String>)newValue);
 				return;
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
 				setProfileUri((String)newValue);
 				return;
 		}
@@ -170,10 +170,10 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
 				getStereotypesQualifiedNames().clear();
 				return;
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
 				setProfileUri(PROFILE_URI_EDEFAULT);
 				return;
 		}
@@ -188,9 +188,9 @@ public class StereotypeApplicationMatcherConfigurationImpl extends AbstractMatch
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
 				return stereotypesQualifiedNames != null && !stereotypesQualifiedNames.isEmpty();
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
 				return PROFILE_URI_EDEFAULT == null ? profileUri != null : !PROFILE_URI_EDEFAULT.equals(profileUri);
 		}
 		return super.eIsSet(featureID);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeApplicationMatcherFactoryImpl.java
index f379028f92a..f00895c06eb 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeApplicationMatcherFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,24 +28,24 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationm
  * <!-- end-user-doc -->
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationFactoryImpl extends EFactoryImpl implements StereotypeApplicationMatcherConfigurationFactory {
+public class StereotypeApplicationMatcherFactoryImpl extends EFactoryImpl implements StereotypeApplicationMatcherFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static StereotypeApplicationMatcherConfigurationFactory init() {
+	public static StereotypeApplicationMatcherFactory init() {
 		try {
-			StereotypeApplicationMatcherConfigurationFactory theStereotypeApplicationMatcherConfigurationFactory = (StereotypeApplicationMatcherConfigurationFactory)EPackage.Registry.INSTANCE.getEFactory(StereotypeApplicationMatcherConfigurationPackage.eNS_URI);
-			if (theStereotypeApplicationMatcherConfigurationFactory != null) {
-				return theStereotypeApplicationMatcherConfigurationFactory;
+			StereotypeApplicationMatcherFactory theStereotypeApplicationMatcherFactory = (StereotypeApplicationMatcherFactory)EPackage.Registry.INSTANCE.getEFactory(StereotypeApplicationMatcherPackage.eNS_URI);
+			if (theStereotypeApplicationMatcherFactory != null) {
+				return theStereotypeApplicationMatcherFactory;
 			}
 		}
 		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new StereotypeApplicationMatcherConfigurationFactoryImpl();
+		return new StereotypeApplicationMatcherFactoryImpl();
 	}
 
 	/**
@@ -54,7 +54,7 @@ public class StereotypeApplicationMatcherConfigurationFactoryImpl extends EFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationFactoryImpl() {
+	public StereotypeApplicationMatcherFactoryImpl() {
 		super();
 	}
 
@@ -66,7 +66,7 @@ public class StereotypeApplicationMatcherConfigurationFactoryImpl extends EFacto
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION: return createStereotypeApplicationMatcherConfiguration();
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION: return createStereotypeApplicationMatcherConfiguration();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -87,8 +87,8 @@ public class StereotypeApplicationMatcherConfigurationFactoryImpl extends EFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationPackage getStereotypeApplicationMatcherConfigurationPackage() {
-		return (StereotypeApplicationMatcherConfigurationPackage)getEPackage();
+	public StereotypeApplicationMatcherPackage getStereotypeApplicationMatcherPackage() {
+		return (StereotypeApplicationMatcherPackage)getEPackage();
 	}
 
 	/**
@@ -98,8 +98,8 @@ public class StereotypeApplicationMatcherConfigurationFactoryImpl extends EFacto
 	 * @generated
 	 */
 	@Deprecated
-	public static StereotypeApplicationMatcherConfigurationPackage getPackage() {
-		return StereotypeApplicationMatcherConfigurationPackage.eINSTANCE;
+	public static StereotypeApplicationMatcherPackage getPackage() {
+		return StereotypeApplicationMatcherPackage.eINSTANCE;
 	}
 
-} //StereotypeApplicationMatcherConfigurationFactoryImpl
+} //StereotypeApplicationMatcherFactoryImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeApplicationMatcherPackageImpl.java
index 80e37c845d9..771d28c87f9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/impl/StereotypeApplicationMatcherConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/impl/StereotypeApplicationMatcherPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -19,11 +19,11 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherFactory;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationm
  * <!-- end-user-doc -->
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPackageImpl implements StereotypeApplicationMatcherConfigurationPackage {
+public class StereotypeApplicationMatcherPackageImpl extends EPackageImpl implements StereotypeApplicationMatcherPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -50,12 +50,12 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private StereotypeApplicationMatcherConfigurationPackageImpl() {
-		super(eNS_URI, StereotypeApplicationMatcherConfigurationFactory.eINSTANCE);
+	private StereotypeApplicationMatcherPackageImpl() {
+		super(eNS_URI, StereotypeApplicationMatcherFactory.eINSTANCE);
 	}
 
 	/**
@@ -68,7 +68,7 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link StereotypeApplicationMatcherConfigurationPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link StereotypeApplicationMatcherPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -77,31 +77,31 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static StereotypeApplicationMatcherConfigurationPackage init() {
-		if (isInited) return (StereotypeApplicationMatcherConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(StereotypeApplicationMatcherConfigurationPackage.eNS_URI);
+	public static StereotypeApplicationMatcherPackage init() {
+		if (isInited) return (StereotypeApplicationMatcherPackage)EPackage.Registry.INSTANCE.getEPackage(StereotypeApplicationMatcherPackage.eNS_URI);
 
 		// Obtain or create and register package
-		StereotypeApplicationMatcherConfigurationPackageImpl theStereotypeApplicationMatcherConfigurationPackage = (StereotypeApplicationMatcherConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StereotypeApplicationMatcherConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StereotypeApplicationMatcherConfigurationPackageImpl());
+		StereotypeApplicationMatcherPackageImpl theStereotypeApplicationMatcherPackage = (StereotypeApplicationMatcherPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof StereotypeApplicationMatcherPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new StereotypeApplicationMatcherPackageImpl());
 
 		isInited = true;
 
 		// Initialize simple dependencies
 		EcorePackage.eINSTANCE.eClass();
-		ElementtypesconfigurationsPackage.eINSTANCE.eClass();
+		ElementTypesConfigurationsPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
-		theStereotypeApplicationMatcherConfigurationPackage.createPackageContents();
+		theStereotypeApplicationMatcherPackage.createPackageContents();
 
 		// Initialize created meta-data
-		theStereotypeApplicationMatcherConfigurationPackage.initializePackageContents();
+		theStereotypeApplicationMatcherPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		theStereotypeApplicationMatcherConfigurationPackage.freeze();
+		theStereotypeApplicationMatcherPackage.freeze();
 
   
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(StereotypeApplicationMatcherConfigurationPackage.eNS_URI, theStereotypeApplicationMatcherConfigurationPackage);
-		return theStereotypeApplicationMatcherConfigurationPackage;
+		EPackage.Registry.INSTANCE.put(StereotypeApplicationMatcherPackage.eNS_URI, theStereotypeApplicationMatcherPackage);
+		return theStereotypeApplicationMatcherPackage;
 	}
 
 	/**
@@ -136,8 +136,8 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationFactory getStereotypeApplicationMatcherConfigurationFactory() {
-		return (StereotypeApplicationMatcherConfigurationFactory)getEFactoryInstance();
+	public StereotypeApplicationMatcherFactory getStereotypeApplicationMatcherFactory() {
+		return (StereotypeApplicationMatcherFactory)getEFactoryInstance();
 	}
 
 	/**
@@ -188,7 +188,7 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		ElementtypesconfigurationsPackage theElementtypesconfigurationsPackage = (ElementtypesconfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementtypesconfigurationsPackage.eNS_URI);
+		ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Create type parameters
@@ -196,7 +196,7 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		stereotypeApplicationMatcherConfigurationEClass.getESuperTypes().add(theElementtypesconfigurationsPackage.getAbstractMatcherConfiguration());
+		stereotypeApplicationMatcherConfigurationEClass.getESuperTypes().add(theElementTypesConfigurationsPackage.getAbstractMatcherConfiguration());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(stereotypeApplicationMatcherConfigurationEClass, StereotypeApplicationMatcherConfiguration.class, "StereotypeApplicationMatcherConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -207,4 +207,4 @@ public class StereotypeApplicationMatcherConfigurationPackageImpl extends EPacka
 		createResource(eNS_URI);
 	}
 
-} //StereotypeApplicationMatcherConfigurationPackageImpl
+} //StereotypeApplicationMatcherPackageImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java
index 998b14c66e5..c9b50ccf08e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/provider/StereotypeApplicationMatcherConfigurationEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
 /**
  * This is the central singleton for the StereotypeApplicationMatcherConfiguration edit plugin.
@@ -53,7 +53,7 @@ public final class StereotypeApplicationMatcherConfigurationEditPlugin extends E
 		super
 		  (new ResourceLocator [] {
 		     EcoreEditPlugin.INSTANCE,
-		     ElementTypesConfigurationsEditPlugin.INSTANCE,
+		     TypesConfigurationsEditPlugin.INSTANCE,
 		   });
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/provider/StereotypeApplicationMatcherConfigurationItemProvider.java
index 6c74ede345c..af6a017f637 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/provider/StereotypeApplicationMatcherConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider;
 
 
 import java.util.Collection;
@@ -26,13 +26,13 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.AbstractMatcherConfigurationItemProvider;
+import org.eclipse.papyrus.infra.types.provider.AbstractMatcherConfigurationItemProvider;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
@@ -78,7 +78,7 @@ public class StereotypeApplicationMatcherConfigurationItemProvider extends Abstr
 				 getResourceLocator(),
 				 getString("_UI_StereotypeApplicationMatcherConfiguration_stereotypesQualifiedNames_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypeApplicationMatcherConfiguration_stereotypesQualifiedNames_feature", "_UI_StereotypeApplicationMatcherConfiguration_type"),
-				 StereotypeApplicationMatcherConfigurationPackage.Literals.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES,
+				 StereotypeApplicationMatcherPackage.Literals.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES,
 				 true,
 				 false,
 				 false,
@@ -100,7 +100,7 @@ public class StereotypeApplicationMatcherConfigurationItemProvider extends Abstr
 				 getResourceLocator(),
 				 getString("_UI_StereotypeApplicationMatcherConfiguration_profileUri_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypeApplicationMatcherConfiguration_profileUri_feature", "_UI_StereotypeApplicationMatcherConfiguration_type"),
-				 StereotypeApplicationMatcherConfigurationPackage.Literals.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI,
+				 StereotypeApplicationMatcherPackage.Literals.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI,
 				 true,
 				 false,
 				 false,
@@ -147,8 +147,8 @@ public class StereotypeApplicationMatcherConfigurationItemProvider extends Abstr
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(StereotypeApplicationMatcherConfiguration.class)) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__STEREOTYPES_QUALIFIED_NAMES:
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION__PROFILE_URI:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/provider/StereotypeApplicationMatcherItemProviderAdapterFactory.java
index 1e30d1c9948..1f0440db757 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/provider/StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/provider/StereotypeApplicationMatcherItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,16 +41,16 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ContainerConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ContainerConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.util.ElementtypesconfigurationsSwitch;
+import org.eclipse.papyrus.infra.types.util.ElementTypesConfigurationsSwitch;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationFactory;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherFactory;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.util.StereotypeApplicationMatcherAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -61,7 +61,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationm
  * <!-- end-user-doc -->
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory extends StereotypeApplicationMatcherConfigurationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class StereotypeApplicationMatcherItemProviderAdapterFactory extends StereotypeApplicationMatcherAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -92,7 +92,7 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory() {
+	public StereotypeApplicationMatcherItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -101,7 +101,7 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -109,7 +109,7 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 	protected StereotypeApplicationMatcherConfigurationItemProvider stereotypeApplicationMatcherConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -226,19 +226,19 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 	}
 
 	/**
-	 * A child creation extender for the {@link ElementtypesconfigurationsPackage}.
+	 * A child creation extender for the {@link ElementTypesConfigurationsPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class ElementtypesconfigurationsChildCreationExtender implements IChildCreationExtender {
+	public static class ElementTypesConfigurationsChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ElementtypesconfigurationsSwitch<Object> {
+		protected static class CreationSwitch extends ElementTypesConfigurationsSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -274,8 +274,8 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 			public Object caseAbstractAdviceBindingConfiguration(AbstractAdviceBindingConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION,
-						 StereotypeApplicationMatcherConfigurationFactory.eINSTANCE.createStereotypeApplicationMatcherConfiguration()));
+						(ElementTypesConfigurationsPackage.Literals.ABSTRACT_ADVICE_BINDING_CONFIGURATION__MATCHER_CONFIGURATION,
+						 StereotypeApplicationMatcherFactory.eINSTANCE.createStereotypeApplicationMatcherConfiguration()));
 
 				return null;
 			}
@@ -289,8 +289,8 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 			public Object caseSpecializationTypeConfiguration(SpecializationTypeConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION,
-						 StereotypeApplicationMatcherConfigurationFactory.eINSTANCE.createStereotypeApplicationMatcherConfiguration()));
+						(ElementTypesConfigurationsPackage.Literals.SPECIALIZATION_TYPE_CONFIGURATION__MATCHER_CONFIGURATION,
+						 StereotypeApplicationMatcherFactory.eINSTANCE.createStereotypeApplicationMatcherConfiguration()));
 
 				return null;
 			}
@@ -304,8 +304,8 @@ public class StereotypeApplicationMatcherConfigurationItemProviderAdapterFactory
 			public Object caseContainerConfiguration(ContainerConfiguration object) {
 				newChildDescriptors.add
 					(createChildParameter
-						(ElementtypesconfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION,
-						 StereotypeApplicationMatcherConfigurationFactory.eINSTANCE.createStereotypeApplicationMatcherConfiguration()));
+						(ElementTypesConfigurationsPackage.Literals.CONTAINER_CONFIGURATION__CONTAINER_MATCHER_CONFIGURATION,
+						 StereotypeApplicationMatcherFactory.eINSTANCE.createStereotypeApplicationMatcherConfiguration()));
 
 				return null;
 			}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherAdapterFactory.java
index 0d603c5e7d4..ac6c7eb3023 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -19,26 +19,26 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationAdapterFactory extends AdapterFactoryImpl {
+public class StereotypeApplicationMatcherAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static StereotypeApplicationMatcherConfigurationPackage modelPackage;
+	protected static StereotypeApplicationMatcherPackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -46,9 +46,9 @@ public class StereotypeApplicationMatcherConfigurationAdapterFactory extends Ada
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationAdapterFactory() {
+	public StereotypeApplicationMatcherAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = StereotypeApplicationMatcherConfigurationPackage.eINSTANCE;
+			modelPackage = StereotypeApplicationMatcherPackage.eINSTANCE;
 		}
 	}
 
@@ -77,8 +77,8 @@ public class StereotypeApplicationMatcherConfigurationAdapterFactory extends Ada
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected StereotypeApplicationMatcherConfigurationSwitch<Adapter> modelSwitch =
-		new StereotypeApplicationMatcherConfigurationSwitch<Adapter>() {
+	protected StereotypeApplicationMatcherSwitch<Adapter> modelSwitch =
+		new StereotypeApplicationMatcherSwitch<Adapter>() {
 			@Override
 			public Adapter caseStereotypeApplicationMatcherConfiguration(StereotypeApplicationMatcherConfiguration object) {
 				return createStereotypeApplicationMatcherConfigurationAdapter();
@@ -108,13 +108,13 @@ public class StereotypeApplicationMatcherConfigurationAdapterFactory extends Ada
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration <em>Stereotype Application Matcher Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration
+	 * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration
 	 * @generated
 	 */
 	public Adapter createStereotypeApplicationMatcherConfigurationAdapter() {
@@ -122,13 +122,13 @@ public class StereotypeApplicationMatcherConfigurationAdapterFactory extends Ada
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration <em>Abstract Matcher Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration <em>Abstract Matcher Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration
+	 * @see org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration
 	 * @generated
 	 */
 	public Adapter createAbstractMatcherConfigurationAdapter() {
@@ -147,4 +147,4 @@ public class StereotypeApplicationMatcherConfigurationAdapterFactory extends Ada
 		return null;
 	}
 
-} //StereotypeApplicationMatcherConfigurationAdapterFactory
+} //StereotypeApplicationMatcherAdapterFactory
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherResourceFactoryImpl.java
index 9ad3a267e38..ad92e152ec6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf/src-gen/org/eclipse/papyrus/infra/elementtypesconfigurations/emf/setvaluesadviceconfiguration/util/SetValuesAdviceConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,17 +22,17 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.infra.elementtypesconfigurations.emf.setvaluesadviceconfiguration.util.SetValuesAdviceConfigurationResourceImpl
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.util.StereotypeApplicationMatcherResourceImpl
  * @generated
  */
-public class SetValuesAdviceConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+public class StereotypeApplicationMatcherResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public SetValuesAdviceConfigurationResourceFactoryImpl() {
+	public StereotypeApplicationMatcherResourceFactoryImpl() {
 		super();
 	}
 
@@ -44,8 +44,8 @@ public class SetValuesAdviceConfigurationResourceFactoryImpl extends ResourceFac
 	 */
 	@Override
 	public Resource createResource(URI uri) {
-		Resource result = new SetValuesAdviceConfigurationResourceImpl(uri);
+		Resource result = new StereotypeApplicationMatcherResourceImpl(uri);
 		return result;
 	}
 
-} //SetValuesAdviceConfigurationResourceFactoryImpl
+} //StereotypeApplicationMatcherResourceFactoryImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherResourceImpl.java
index 4f2f11dc978..7ed6e67b73d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationResourceImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util.StereotypeApplicationMatcherConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.util.StereotypeApplicationMatcherResourceFactoryImpl
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationResourceImpl extends XMLResourceImpl {
+public class StereotypeApplicationMatcherResourceImpl extends XMLResourceImpl {
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
@@ -31,8 +31,8 @@ public class StereotypeApplicationMatcherConfigurationResourceImpl extends XMLRe
 	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationResourceImpl(URI uri) {
+	public StereotypeApplicationMatcherResourceImpl(URI uri) {
 		super(uri);
 	}
 
-} //StereotypeApplicationMatcherConfigurationResourceImpl
+} //StereotypeApplicationMatcherResourceImpl
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherSwitch.java
index 1511afa9ce0..9657a8618af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherSwitch.java
@@ -10,16 +10,16 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,17 +31,17 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationm
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationSwitch<T> extends Switch<T> {
+public class StereotypeApplicationMatcherSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static StereotypeApplicationMatcherConfigurationPackage modelPackage;
+	protected static StereotypeApplicationMatcherPackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -49,9 +49,9 @@ public class StereotypeApplicationMatcherConfigurationSwitch<T> extends Switch<T
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationSwitch() {
+	public StereotypeApplicationMatcherSwitch() {
 		if (modelPackage == null) {
-			modelPackage = StereotypeApplicationMatcherConfigurationPackage.eINSTANCE;
+			modelPackage = StereotypeApplicationMatcherPackage.eINSTANCE;
 		}
 	}
 
@@ -78,7 +78,7 @@ public class StereotypeApplicationMatcherConfigurationSwitch<T> extends Switch<T
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-			case StereotypeApplicationMatcherConfigurationPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION: {
+			case StereotypeApplicationMatcherPackage.STEREOTYPE_APPLICATION_MATCHER_CONFIGURATION: {
 				StereotypeApplicationMatcherConfiguration stereotypeApplicationMatcherConfiguration = (StereotypeApplicationMatcherConfiguration)theEObject;
 				T result = caseStereotypeApplicationMatcherConfiguration(stereotypeApplicationMatcherConfiguration);
 				if (result == null) result = caseAbstractMatcherConfiguration(stereotypeApplicationMatcherConfiguration);
@@ -90,13 +90,13 @@ public class StereotypeApplicationMatcherConfigurationSwitch<T> extends Switch<T
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Stereotype Application Matcher Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Stereotype Application Matcher Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -135,4 +135,4 @@ public class StereotypeApplicationMatcherConfigurationSwitch<T> extends Switch<T
 		return null;
 	}
 
-} //StereotypeApplicationMatcherConfigurationSwitch
+} //StereotypeApplicationMatcherSwitch
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationXMLProcessor.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherXMLProcessor.java
index 45f3f423e53..578738ea693 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/util/StereotypeApplicationMatcherConfigurationXMLProcessor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/matchers/stereotype/util/StereotypeApplicationMatcherXMLProcessor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype.util;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
@@ -28,7 +28,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationm
  * <!-- end-user-doc -->
  * @generated
  */
-public class StereotypeApplicationMatcherConfigurationXMLProcessor extends XMLProcessor {
+public class StereotypeApplicationMatcherXMLProcessor extends XMLProcessor {
 
 	/**
 	 * Public constructor to instantiate the helper.
@@ -36,13 +36,13 @@ public class StereotypeApplicationMatcherConfigurationXMLProcessor extends XMLPr
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StereotypeApplicationMatcherConfigurationXMLProcessor() {
+	public StereotypeApplicationMatcherXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
-		StereotypeApplicationMatcherConfigurationPackage.eINSTANCE.eClass();
+		StereotypeApplicationMatcherPackage.eINSTANCE.eClass();
 	}
 	
 	/**
-	 * Register for "*" and "xml" file extensions the StereotypeApplicationMatcherConfigurationResourceFactoryImpl factory.
+	 * Register for "*" and "xml" file extensions the StereotypeApplicationMatcherResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -51,10 +51,10 @@ public class StereotypeApplicationMatcherConfigurationXMLProcessor extends XMLPr
 	protected Map<String, Resource.Factory> getRegistrations() {
 		if (registrations == null) {
 			super.getRegistrations();
-			registrations.put(XML_EXTENSION, new StereotypeApplicationMatcherConfigurationResourceFactoryImpl());
-			registrations.put(STAR_EXTENSION, new StereotypeApplicationMatcherConfigurationResourceFactoryImpl());
+			registrations.put(XML_EXTENSION, new StereotypeApplicationMatcherResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new StereotypeApplicationMatcherResourceFactoryImpl());
 		}
 		return registrations;
 	}
 
-} //StereotypeApplicationMatcherConfigurationXMLProcessor
+} //StereotypeApplicationMatcherXMLProcessor
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfiguration.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRuleConfiguration.java
index ebf60c01104..ee784ffb1dc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfiguration.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRuleConfiguration.java
@@ -10,9 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,16 +21,16 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}</li>
  * </ul>
  *
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration()
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration()
  * @model
  * @generated
  */
-public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfiguration {
+public interface InvariantStereotypeRuleConfiguration extends org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Stereotype Qualified Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -43,14 +41,14 @@ public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Stereotype Qualified Name</em>' attribute.
 	 * @see #setStereotypeQualifiedName(String)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_StereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_StereotypeQualifiedName()
 	 * @model required="true"
 	 * @generated
 	 */
 	String getStereotypeQualifiedName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Stereotype Qualified Name</em>' attribute.
@@ -69,14 +67,14 @@ public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Required Profile</em>' attribute.
 	 * @see #setRequiredProfile(String)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_RequiredProfile()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_RequiredProfile()
 	 * @model
 	 * @generated
 	 */
 	String getRequiredProfile();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Required Profile</em>' attribute.
@@ -95,14 +93,14 @@ public interface InvariantStereotypeRuleConfiguration extends InvariantRuleConfi
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Strict</em>' attribute.
 	 * @see #setStrict(boolean)
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_Strict()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage#getInvariantStereotypeRuleConfiguration_Strict()
 	 * @model required="true"
 	 * @generated
 	 */
 	boolean isStrict();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Strict</em>' attribute.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRuleConfigurationFactory.java
index 2ecb0e75fc2..dfc4eab351e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRuleConfigurationFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage
  * @generated
  */
 public interface InvariantStereotypeRuleConfigurationFactory extends EFactory {
@@ -29,7 +29,7 @@ public interface InvariantStereotypeRuleConfigurationFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InvariantStereotypeRuleConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationFactoryImpl.init();
+	InvariantStereotypeRuleConfigurationFactory eINSTANCE = org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Invariant Stereotype Rule Configuration</em>'.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationPackage.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRuleConfigurationPackage.java
index e5460aa265b..2f17a8a2f1e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRuleConfigurationPackage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRuleConfigurationPackage.java
@@ -10,13 +10,13 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,7 +30,7 @@ import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfigu
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationFactory
  * @model kind="package"
  * @generated
  */
@@ -41,7 +41,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "invariantstereotyperuleconfiguration";
+	String eNAME = "invariantstereotype";
 
 	/**
 	 * The package namespace URI.
@@ -49,7 +49,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/invariantstereotyperule/1.1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1";
 
 	/**
 	 * The package namespace name.
@@ -57,7 +57,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "invariantstereotyperuleconfiguration";
+	String eNS_PREFIX = "invariantstereotyperule";
 
 	/**
 	 * The singleton instance of the package.
@@ -65,14 +65,14 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	InvariantStereotypeRuleConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl.init();
+	InvariantStereotypeRuleConfigurationPackage eINSTANCE = org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
 	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION = 0;
@@ -84,7 +84,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 0;
+	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION__STEREOTYPE_QUALIFIED_NAME = RuleBasedPackage.RULE_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Required Profile</b></em>' attribute.
@@ -93,7 +93,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION__REQUIRED_PROFILE = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 1;
+	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION__REQUIRED_PROFILE = RuleBasedPackage.RULE_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Strict</b></em>' attribute.
@@ -102,7 +102,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION__STRICT = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 2;
+	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION__STRICT = RuleBasedPackage.RULE_CONFIGURATION_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Invariant Stereotype Rule Configuration</em>' class.
@@ -111,7 +111,7 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION_FEATURE_COUNT = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_FEATURE_COUNT + 3;
+	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION_FEATURE_COUNT = RuleBasedPackage.RULE_CONFIGURATION_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of operations of the '<em>Invariant Stereotype Rule Configuration</em>' class.
@@ -120,47 +120,47 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION_OPERATION_COUNT = InvariantTypeConfigurationPackage.INVARIANT_RULE_CONFIGURATION_OPERATION_COUNT + 0;
+	int INVARIANT_STEREOTYPE_RULE_CONFIGURATION_OPERATION_COUNT = RuleBasedPackage.RULE_CONFIGURATION_OPERATION_COUNT + 0;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Invariant Stereotype Rule Configuration</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration
 	 * @generated
 	 */
 	EClass getInvariantStereotypeRuleConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Stereotype Qualified Name</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getStereotypeQualifiedName()
 	 * @see #getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
 	EAttribute getInvariantStereotypeRuleConfiguration_StereotypeQualifiedName();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getRequiredProfile <em>Required Profile</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Required Profile</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#getRequiredProfile()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#getRequiredProfile()
 	 * @see #getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
 	EAttribute getInvariantStereotypeRuleConfiguration_RequiredProfile();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#isStrict <em>Strict</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Strict</em>'.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration#isStrict()
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration#isStrict()
 	 * @see #getInvariantStereotypeRuleConfiguration()
 	 * @generated
 	 */
@@ -190,11 +190,11 @@ public interface InvariantStereotypeRuleConfigurationPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl <em>Invariant Stereotype Rule Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl
-		 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
+		 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl
+		 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationPackageImpl#getInvariantStereotypeRuleConfiguration()
 		 * @generated
 		 */
 		EClass INVARIANT_STEREOTYPE_RULE_CONFIGURATION = eINSTANCE.getInvariantStereotypeRuleConfiguration();
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java
index c39f35bec40..4261b68d937 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/impl/InvariantStereotypeRuleConfigurationFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.*;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/impl/InvariantStereotypeRuleConfigurationImpl.java
index 3f6d79c85db..5b37449db1c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/impl/InvariantStereotypeRuleConfigurationImpl.java
@@ -10,18 +10,15 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.impl.InvariantRuleConfigurationImpl;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,14 +28,14 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperul
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#getRequiredProfile <em>Required Profile</em>}</li>
- *   <li>{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl.InvariantStereotypeRuleConfigurationImpl#isStrict <em>Strict</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl#getStereotypeQualifiedName <em>Stereotype Qualified Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl#getRequiredProfile <em>Required Profile</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl.InvariantStereotypeRuleConfigurationImpl#isStrict <em>Strict</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class InvariantStereotypeRuleConfigurationImpl extends InvariantRuleConfigurationImpl implements InvariantStereotypeRuleConfiguration {
+public class InvariantStereotypeRuleConfigurationImpl extends org.eclipse.papyrus.infra.types.rulebased.impl.RuleConfigurationImpl implements InvariantStereotypeRuleConfiguration {
 	/**
 	 * The default value of the '{@link #getStereotypeQualifiedName() <em>Stereotype Qualified Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationPackageImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/impl/InvariantStereotypeRuleConfigurationPackageImpl.java
index c5d17abb3d6..bc03204f384 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/impl/InvariantStereotypeRuleConfigurationPackageImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/impl/InvariantStereotypeRuleConfigurationPackageImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.impl;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -19,11 +19,10 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationFactory;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -50,7 +49,7 @@ public class InvariantStereotypeRuleConfigurationPackageImpl extends EPackageImp
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage#eNS_URI
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -88,7 +87,7 @@ public class InvariantStereotypeRuleConfigurationPackageImpl extends EPackageImp
 		isInited = true;
 
 		// Initialize simple dependencies
-		InvariantTypeConfigurationPackage.eINSTANCE.eClass();
+		RuleBasedPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theInvariantStereotypeRuleConfigurationPackage.createPackageContents();
@@ -201,7 +200,7 @@ public class InvariantStereotypeRuleConfigurationPackageImpl extends EPackageImp
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		InvariantTypeConfigurationPackage theInvariantTypeConfigurationPackage = (InvariantTypeConfigurationPackage) EPackage.Registry.INSTANCE.getEPackage(InvariantTypeConfigurationPackage.eNS_URI);
+		RuleBasedPackage theRuleBasedPackage = (RuleBasedPackage) EPackage.Registry.INSTANCE.getEPackage(RuleBasedPackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Create type parameters
@@ -209,7 +208,7 @@ public class InvariantStereotypeRuleConfigurationPackageImpl extends EPackageImp
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		invariantStereotypeRuleConfigurationEClass.getESuperTypes().add(theInvariantTypeConfigurationPackage.getInvariantRuleConfiguration());
+		invariantStereotypeRuleConfigurationEClass.getESuperTypes().add(theRuleBasedPackage.getRuleConfiguration());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(invariantStereotypeRuleConfigurationEClass, InvariantStereotypeRuleConfiguration.class, "InvariantStereotypeRuleConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationEditPlugin.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/provider/InvariantStereotypeRuleConfigurationEditPlugin.java
index e9d575a62fb..79a1e9dadf8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationEditPlugin.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/provider/InvariantStereotypeRuleConfigurationEditPlugin.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 
@@ -18,9 +18,9 @@ import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantTypeConfigurationEditPlugin;
+import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.provider.ElementTypesConfigurationsEditPlugin;
+import org.eclipse.papyrus.infra.types.rulebased.provider.RuleBasedEditPlugin;
 
 /**
  * This is the central singleton for the InvariantStereotypeRuleConfiguration edit plugin.
@@ -54,8 +54,8 @@ public final class InvariantStereotypeRuleConfigurationEditPlugin extends EMFPlu
 	public InvariantStereotypeRuleConfigurationEditPlugin() {
 		super(new ResourceLocator[] {
 				EcoreEditPlugin.INSTANCE,
-				ElementTypesConfigurationsEditPlugin.INSTANCE,
-				InvariantTypeConfigurationEditPlugin.INSTANCE,
+				TypesConfigurationsEditPlugin.INSTANCE,
+				RuleBasedEditPlugin.INSTANCE,
 		});
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProvider.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/provider/InvariantStereotypeRuleConfigurationItemProvider.java
index d00cab75979..397672a3801 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/provider/InvariantStereotypeRuleConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider;
 
 
 import java.util.Collection;
@@ -25,19 +25,16 @@ import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.provider.InvariantRuleConfigurationItemProvider;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
  */
-public class InvariantStereotypeRuleConfigurationItemProvider extends InvariantRuleConfigurationItemProvider {
+public class InvariantStereotypeRuleConfigurationItemProvider extends org.eclipse.papyrus.infra.types.rulebased.provider.RuleConfigurationItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java
index ecf2d1a1c68..60b2f2abd76 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/provider/InvariantStereotypeRuleConfigurationItemProviderAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.provider;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,16 +41,12 @@ import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.CompositeInvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantTypeConfigurationPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.NotInvariantRuleConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedPackage;
+import org.eclipse.papyrus.infra.types.rulebased.RuleBasedTypeConfiguration;
+import org.eclipse.papyrus.infra.types.rulebased.util.RuleBasedSwitch;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationFactory;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.util.InvariantTypeConfigurationSwitch;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationFactory;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationAdapterFactory;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util.InvariantStereotypeRuleConfigurationAdapterFactory;
 
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers.
@@ -101,7 +97,7 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -109,7 +105,7 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 	protected InvariantStereotypeRuleConfigurationItemProvider invariantStereotypeRuleConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -227,19 +223,19 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 	}
 
 	/**
-	 * A child creation extender for the {@link InvariantTypeConfigurationPackage}.
+	 * A child creation extender for the {@link RuleBasedPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class InvariantTypeConfigurationChildCreationExtender implements IChildCreationExtender {
+	public static class RuleBasedChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		protected static class CreationSwitch extends InvariantTypeConfigurationSwitch<Object> {
+		protected static class CreationSwitch extends RuleBasedSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
@@ -273,21 +269,8 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 			 * @generated
 			 */
 			@Override
-			public Object caseInvariantTypeConfiguration(InvariantTypeConfiguration object) {
-				newChildDescriptors.add(createChildParameter(InvariantTypeConfigurationPackage.Literals.INVARIANT_TYPE_CONFIGURATION__INVARIANT_RULE_CONFIGURATION,
-						InvariantStereotypeRuleConfigurationFactory.eINSTANCE.createInvariantStereotypeRuleConfiguration()));
-
-				return null;
-			}
-
-			/**
-			 * <!-- begin-user-doc -->
-			 * <!-- end-user-doc -->
-			 * @generated
-			 */
-			@Override
-			public Object caseCompositeInvariantRuleConfiguration(CompositeInvariantRuleConfiguration object) {
-				newChildDescriptors.add(createChildParameter(InvariantTypeConfigurationPackage.Literals.COMPOSITE_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULES,
+			public Object caseRuleBasedTypeConfiguration(RuleBasedTypeConfiguration object) {
+				newChildDescriptors.add(createChildParameter(RuleBasedPackage.Literals.RULE_BASED_TYPE_CONFIGURATION__RULE_CONFIGURATION,
 						InvariantStereotypeRuleConfigurationFactory.eINSTANCE.createInvariantStereotypeRuleConfiguration()));
 
 				return null;
@@ -299,8 +282,8 @@ public class InvariantStereotypeRuleConfigurationItemProviderAdapterFactory exte
 			 * @generated
 			 */
 			@Override
-			public Object caseNotInvariantRuleConfiguration(NotInvariantRuleConfiguration object) {
-				newChildDescriptors.add(createChildParameter(InvariantTypeConfigurationPackage.Literals.NOT_INVARIANT_RULE_CONFIGURATION__COMPOSED_RULE,
+			public Object caseCompositeRuleConfiguration(org.eclipse.papyrus.infra.types.rulebased.CompositeRuleConfiguration object) {
+				newChildDescriptors.add(createChildParameter(RuleBasedPackage.Literals.COMPOSITE_RULE_CONFIGURATION__COMPOSED_RULES,
 						InvariantStereotypeRuleConfigurationFactory.eINSTANCE.createInvariantStereotypeRuleConfiguration()));
 
 				return null;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationAdapterFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationAdapterFactory.java
index fa5f632c4b5..3956c7fc24e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationAdapterFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationAdapterFactory.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -18,17 +18,14 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.*;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationAdapterFactory extends AdapterFactoryImpl {
@@ -84,8 +81,8 @@ public class InvariantStereotypeRuleConfigurationAdapterFactory extends AdapterF
 		}
 
 		@Override
-		public Adapter caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
-			return createInvariantRuleConfigurationAdapter();
+		public Adapter caseRuleConfiguration(org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration object) {
+			return createRuleConfigurationAdapter();
 		}
 
 		@Override
@@ -109,13 +106,13 @@ public class InvariantStereotypeRuleConfigurationAdapterFactory extends AdapterF
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration <em>Invariant Stereotype Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfiguration
+	 * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfiguration
 	 * @generated
 	 */
 	public Adapter createInvariantStereotypeRuleConfigurationAdapter() {
@@ -123,16 +120,16 @@ public class InvariantStereotypeRuleConfigurationAdapterFactory extends AdapterF
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration <em>Invariant Rule Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration <em>Rule Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration
+	 * @see org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration
 	 * @generated
 	 */
-	public Adapter createInvariantRuleConfigurationAdapter() {
+	public Adapter createRuleConfigurationAdapter() {
 		return null;
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java
index 6a79877fa49..aed3a130d68 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationResourceFactoryImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceImpl
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util.InvariantStereotypeRuleConfigurationResourceImpl
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceImpl.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationResourceImpl.java
index 630d7012f8e..7a178e4777d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationResourceImpl.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationResourceImpl.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util;
 
 import org.eclipse.emf.common.util.URI;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util.InvariantStereotypeRuleConfigurationResourceFactoryImpl
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationResourceImpl extends XMLResourceImpl {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationSwitch.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationSwitch.java
index c5d60527ca7..26a0dbfc4b6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationSwitch.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationSwitch.java
@@ -10,16 +10,13 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
-
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.*;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +28,7 @@ import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperul
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage
+ * @see org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage
  * @generated
  */
 public class InvariantStereotypeRuleConfigurationSwitch<T> extends Switch<T> {
@@ -82,7 +79,7 @@ public class InvariantStereotypeRuleConfigurationSwitch<T> extends Switch<T> {
 			InvariantStereotypeRuleConfiguration invariantStereotypeRuleConfiguration = (InvariantStereotypeRuleConfiguration) theEObject;
 			T result = caseInvariantStereotypeRuleConfiguration(invariantStereotypeRuleConfiguration);
 			if (result == null)
-				result = caseInvariantRuleConfiguration(invariantStereotypeRuleConfiguration);
+				result = caseRuleConfiguration(invariantStereotypeRuleConfiguration);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
@@ -108,17 +105,17 @@ public class InvariantStereotypeRuleConfigurationSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Rule Configuration</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invariant Rule Configuration</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Rule Configuration</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseInvariantRuleConfiguration(InvariantRuleConfiguration object) {
+	public T caseRuleConfiguration(org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration object) {
 		return null;
 	}
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationXMLProcessor.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationXMLProcessor.java
index 405c98c22ec..59c91e86715 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src-gen/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/util/InvariantStereotypeRuleConfigurationXMLProcessor.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src-gen/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/util/InvariantStereotypeRuleConfigurationXMLProcessor.java
@@ -10,7 +10,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  */
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.util;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.util;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 
-import org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration.InvariantStereotypeRuleConfigurationPackage;
+import org.eclipse.papyrus.uml.types.core.rules.invariantstereotype.InvariantStereotypeRuleConfigurationPackage;
 
 /**
  * This class contains helper methods to serialize and deserialize XML documents
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/Activator.java
index a6a13edb45d..3c5a84bb8af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/Activator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/Activator.java
@@ -1,78 +1,78 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations;
-
-import org.eclipse.papyrus.infra.core.log.LogHelper;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * This is the central singleton for the ApplyStereotypeAdviceConfiguration model plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public final class Activator extends AbstractUIPlugin {
-
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.elementtypesconfigurations"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator INSTANCE;
-
-	/** Logging helper */
-	public static LogHelper log;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		INSTANCE = this;
-		log = new LogHelper(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		log = null;
-		INSTANCE = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return INSTANCE;
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core;

+

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * This is the central singleton for the ApplyStereotypeAdviceConfiguration model plugin.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * 

+ * @generated

+ */

+public final class Activator extends AbstractUIPlugin {

+

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.types.core"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator INSTANCE;

+

+	/** Logging helper */

+	public static LogHelper log;

+

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	@Override

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		INSTANCE = this;

+		log = new LogHelper(this);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	@Override

+	public void stop(BundleContext context) throws Exception {

+		log = null;

+		INSTANCE = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return INSTANCE;

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceConfigurationFactory.java
index 6e3a7c3747a..b2d4d921e2e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceConfigurationFactory.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
-
-public class ApplyStereotypeAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {
-
-
-	@Override
-	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {
-		if (adviceConfiguration instanceof ApplyStereotypeAdviceConfiguration) {
-			IEditHelperAdvice editHelperAdvice = new ApplyStereotypeAdviceEditHelperAdvice((ApplyStereotypeAdviceConfiguration) adviceConfiguration);
-			return editHelperAdvice;
-		}
-		return NullEditHelperAdvice.getInstance();
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;

+import org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceBindingFactory;

+import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;

+

+

+public class ApplyStereotypeAdviceConfigurationFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {

+

+

+	@Override

+	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {

+		if (adviceConfiguration instanceof ApplyStereotypeAdviceConfiguration) {

+			IEditHelperAdvice editHelperAdvice = new ApplyStereotypeAdviceEditHelperAdvice((ApplyStereotypeAdviceConfiguration) adviceConfiguration);

+			return editHelperAdvice;

+		}

+		return NullEditHelperAdvice.getInstance();

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceEditHelperAdvice.java
index 14da444df50..2537c9d0e69 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/ApplyStereotypeAdviceEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/applystereotype/ApplyStereotypeAdviceEditHelperAdvice.java
@@ -1,216 +1,216 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Profile;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.TypedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * advice for the {@link ApplyStereotypeAdviceConfiguration}
- */
-public class ApplyStereotypeAdviceEditHelperAdvice extends AbstractEditHelperAdvice {
-
-
-	protected ApplyStereotypeAdviceConfiguration configuration;
-
-
-	public ApplyStereotypeAdviceEditHelperAdvice(ApplyStereotypeAdviceConfiguration configuration) {
-		this.configuration = configuration;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		if (request instanceof CreateElementRequest) {
-			if (configuration == null) {
-				return false;
-			}
-			if (!(((CreateElementRequest) request).getContainer() instanceof Element)) {
-				return false;
-			}
-			Element container = (Element) ((CreateElementRequest) request).getContainer();
-			Package nearestPackage = container.getNearestPackage();
-			if (nearestPackage == null) {
-				return false;
-			}
-			List<Profile> appliedProfiles = nearestPackage.getAllAppliedProfiles();
-			if (appliedProfiles == null) {
-				// no profiles applied, no stereotype can be applied
-				return false;
-			}
-			List<String> appliedProfileNames = new ArrayList<String>();
-			for (Profile profile : appliedProfiles) {
-				appliedProfileNames.add(profile.getQualifiedName());
-			}
-			for (StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {
-				List<String> requiredProfiles = stereotypeToApply.getRequiredProfiles();
-				if (requiredProfiles != null) {
-					for (String requiredProfile : requiredProfiles) {
-						if (!appliedProfileNames.contains(requiredProfile)) {
-							return false;
-						}
-					}
-				}
-			}
-			return true;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		if (configuration == null) {
-			return null;
-		}
-		ICommand resultCommand = null;
-		// retrieve eobject
-		EObject elementToConfigure = request.getElementToConfigure();
-		if (!(elementToConfigure instanceof Element)) {
-			return null;
-		}
-
-		TransactionalEditingDomain editingDomain = request.getEditingDomain();
-		if (editingDomain == null) {
-			return null;
-		}
-		// retrieve edit service to get features from configure command
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);
-		if (service == null) {
-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);
-			return null;
-		}
-
-		// for each stereotype, apply stereotype and apply values
-		for (StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {
-			Stereotype stereotype = ((Element) elementToConfigure).getApplicableStereotype(stereotypeToApply.getStereotypeQualifiedName());
-
-			if (stereotype != null) {
-
-				ICommand applyStereotypeCommand = service.getEditCommand(new ApplyStereotypeRequest((Element) elementToConfigure, stereotype, editingDomain));
-
-				if (resultCommand == null) {
-					resultCommand = applyStereotypeCommand;
-				} else {
-					resultCommand = resultCommand.compose(applyStereotypeCommand);
-				}
-
-				if (stereotypeToApply.isUpdateName() && elementToConfigure instanceof NamedElement) {
-					if (((NamedElement) elementToConfigure).getNamespace() != null) {
-						String newName = NamedElementUtil.getDefaultNameWithIncrementFromBase(stereotype.getName(), ((NamedElement) elementToConfigure).getNamespace().getMembers());
-						ICommand renameCommand = service.getEditCommand(new SetRequest(editingDomain, elementToConfigure, UMLPackage.eINSTANCE.getNamedElement_Name(), newName));
-
-						if (resultCommand == null) {
-							resultCommand = renameCommand;
-						} else {
-							resultCommand = resultCommand.compose(renameCommand);
-						}
-					}
-				}
-
-				// Set values
-				for (FeatureToSet featureToSet : stereotypeToApply.getFeaturesToSet()) {
-					// retrieve feature value
-					ICommand command = getSetStereotypeFeatureValueCommand((Element) elementToConfigure, stereotype, featureToSet.getFeatureName(), featureToSet.getValue(), service, request);
-					if (command != null) {
-						if (resultCommand == null) {
-							resultCommand = command;
-						} else {
-							resultCommand = resultCommand.compose(command);
-						}
-					}
-				}
-			}
-
-		}
-
-		if (resultCommand != null) {
-			return resultCommand.reduce();
-		}
-		return super.getAfterConfigureCommand(request);
-	}
-
-	/**
-	 * @param elementToConfigure
-	 *            the eobject to configure
-	 * @param name
-	 *            the name of the feature to set
-	 * @param value
-	 *            the new value of the feature
-	 */
-	protected ICommand getSetStereotypeFeatureValueCommand(Element elementToConfigure, Stereotype stereotype, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {
-		if (name == null) {
-			Activator.log.debug("No feature name has been set.");
-			return null;
-		}
-		if (elementToConfigure.eClass() == null) {
-			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);
-			return null;
-		}
-
-		if (configureRequest.getEditingDomain() == null) {
-			return null;
-		}
-
-		// retrieve structural feature for the element to configure
-		TypedElement typedElement = (TypedElement) stereotype.getMember(name, true, UMLPackage.eINSTANCE.getTypedElement());
-		if (typedElement == null) {
-			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);
-			return null;
-		}
-		Object value = getStereotypeValue(elementToConfigure, stereotype, typedElement.getType(), featureValue);
-
-		return service.getEditCommand(new SetStereotypeValueRequest(configureRequest.getEditingDomain(), stereotype, (Element) elementToConfigure, name, value));
-	}
-
-
-	/**
-	 * @param elementToConfigure
-	 * @param stereotype
-	 * @param feature
-	 * @param featureValue
-	 * @return
-	 */
-	protected Object getStereotypeValue(Element elementToConfigure, Stereotype stereotype, Type type, FeatureValue featureValue) {
-		return StereotypeFeatureValueUtils.getValue(elementToConfigure, stereotype, type, featureValue);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

+import org.eclipse.papyrus.uml.types.core.Activator;

+import org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest;

+import org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Profile;

+import org.eclipse.uml2.uml.Stereotype;

+import org.eclipse.uml2.uml.Type;

+import org.eclipse.uml2.uml.TypedElement;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * advice for the {@link ApplyStereotypeAdviceConfiguration}

+ */

+public class ApplyStereotypeAdviceEditHelperAdvice extends AbstractEditHelperAdvice {

+

+

+	protected ApplyStereotypeAdviceConfiguration configuration;

+

+

+	public ApplyStereotypeAdviceEditHelperAdvice(ApplyStereotypeAdviceConfiguration configuration) {

+		this.configuration = configuration;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public boolean approveRequest(IEditCommandRequest request) {

+		if (request instanceof CreateElementRequest) {

+			if (configuration == null) {

+				return false;

+			}

+			if (!(((CreateElementRequest) request).getContainer() instanceof Element)) {

+				return false;

+			}

+			Element container = (Element) ((CreateElementRequest) request).getContainer();

+			Package nearestPackage = container.getNearestPackage();

+			if (nearestPackage == null) {

+				return false;

+			}

+			List<Profile> appliedProfiles = nearestPackage.getAllAppliedProfiles();

+			if (appliedProfiles == null) {

+				// no profiles applied, no stereotype can be applied

+				return false;

+			}

+			List<String> appliedProfileNames = new ArrayList<String>();

+			for (Profile profile : appliedProfiles) {

+				appliedProfileNames.add(profile.getQualifiedName());

+			}

+			for (StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {

+				List<String> requiredProfiles = stereotypeToApply.getRequiredProfiles();

+				if (requiredProfiles != null) {

+					for (String requiredProfile : requiredProfiles) {

+						if (!appliedProfileNames.contains(requiredProfile)) {

+							return false;

+						}

+					}

+				}

+			}

+			return true;

+		}

+

+		return true;

+	}

+

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

+		if (configuration == null) {

+			return null;

+		}

+		ICommand resultCommand = null;

+		// retrieve eobject

+		EObject elementToConfigure = request.getElementToConfigure();

+		if (!(elementToConfigure instanceof Element)) {

+			return null;

+		}

+

+		TransactionalEditingDomain editingDomain = request.getEditingDomain();

+		if (editingDomain == null) {

+			return null;

+		}

+		// retrieve edit service to get features from configure command

+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);

+		if (service == null) {

+			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);

+			return null;

+		}

+

+		// for each stereotype, apply stereotype and apply values

+		for (StereotypeToApply stereotypeToApply : configuration.getStereotypesToApply()) {

+			Stereotype stereotype = ((Element) elementToConfigure).getApplicableStereotype(stereotypeToApply.getStereotypeQualifiedName());

+

+			if (stereotype != null) {

+

+				ICommand applyStereotypeCommand = service.getEditCommand(new ApplyStereotypeRequest((Element) elementToConfigure, stereotype, editingDomain));

+

+				if (resultCommand == null) {

+					resultCommand = applyStereotypeCommand;

+				} else {

+					resultCommand = resultCommand.compose(applyStereotypeCommand);

+				}

+

+				if (stereotypeToApply.isUpdateName() && elementToConfigure instanceof NamedElement) {

+					if (((NamedElement) elementToConfigure).getNamespace() != null) {

+						String newName = NamedElementUtil.getDefaultNameWithIncrementFromBase(stereotype.getName(), ((NamedElement) elementToConfigure).getNamespace().getMembers());

+						ICommand renameCommand = service.getEditCommand(new SetRequest(editingDomain, elementToConfigure, UMLPackage.eINSTANCE.getNamedElement_Name(), newName));

+

+						if (resultCommand == null) {

+							resultCommand = renameCommand;

+						} else {

+							resultCommand = resultCommand.compose(renameCommand);

+						}

+					}

+				}

+

+				// Set values

+				for (FeatureToSet featureToSet : stereotypeToApply.getFeaturesToSet()) {

+					// retrieve feature value

+					ICommand command = getSetStereotypeFeatureValueCommand((Element) elementToConfigure, stereotype, featureToSet.getFeatureName(), featureToSet.getValue(), service, request);

+					if (command != null) {

+						if (resultCommand == null) {

+							resultCommand = command;

+						} else {

+							resultCommand = resultCommand.compose(command);

+						}

+					}

+				}

+			}

+

+		}

+

+		if (resultCommand != null) {

+			return resultCommand.reduce();

+		}

+		return super.getAfterConfigureCommand(request);

+	}

+

+	/**

+	 * @param elementToConfigure

+	 *            the eobject to configure

+	 * @param name

+	 *            the name of the feature to set

+	 * @param value

+	 *            the new value of the feature

+	 */

+	protected ICommand getSetStereotypeFeatureValueCommand(Element elementToConfigure, Stereotype stereotype, String name, FeatureValue featureValue, IElementEditService service, ConfigureRequest configureRequest) {

+		if (name == null) {

+			Activator.log.debug("No feature name has been set.");

+			return null;

+		}

+		if (elementToConfigure.eClass() == null) {

+			Activator.log.error("Impossible to find EClass from EObject: " + elementToConfigure, null);

+			return null;

+		}

+

+		if (configureRequest.getEditingDomain() == null) {

+			return null;

+		}

+

+		// retrieve structural feature for the element to configure

+		TypedElement typedElement = (TypedElement) stereotype.getMember(name, true, UMLPackage.eINSTANCE.getTypedElement());

+		if (typedElement == null) {

+			Activator.log.error("Impossible to find feature " + name + " for eobject " + elementToConfigure, null);

+			return null;

+		}

+		Object value = getStereotypeValue(elementToConfigure, stereotype, typedElement.getType(), featureValue);

+

+		return service.getEditCommand(new SetStereotypeValueRequest(configureRequest.getEditingDomain(), stereotype, (Element) elementToConfigure, name, value));

+	}

+

+

+	/**

+	 * @param elementToConfigure

+	 * @param stereotype

+	 * @param feature

+	 * @param featureValue

+	 * @return

+	 */

+	protected Object getStereotypeValue(Element elementToConfigure, Stereotype stereotype, Type type, FeatureValue featureValue) {

+		return StereotypeFeatureValueUtils.getValue(elementToConfigure, stereotype, type, featureValue);

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeFeatureValueUtils.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/applystereotype/StereotypeFeatureValueUtils.java
index 76b5135707a..2c2b33fb81f 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/applystereotypeadviceconfiguration/StereotypeFeatureValueUtils.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/applystereotype/StereotypeFeatureValueUtils.java
@@ -1,130 +1,130 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter.ConverterNotfoundException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.emf.converter.ConverterRegistry;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.util.ApplyStereotypeAdviceConfigurationSwitch;
-import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.Type;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-
-/**
- * Utility class to get values from a {@link FeatureValue}
- */
-public class StereotypeFeatureValueUtils {
-
-	protected StereotypeFeatureValueUtils() {
-		// no instanciation, helper class
-	}
-
-	/**
-	 * Returns the value to set for a given feature of a given element
-	 * 
-	 * @param elementToConfigure
-	 *            eobject for which feature is set. This must not be <code>null</code>
-	 * @param feature
-	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>
-	 * @param valueModel
-	 *            configuration of the value, stored in the model
-	 * @return the real value that will be set to the object or <code>null</code> if none could be computed
-	 */
-	public static Object getValue(final EObject elementToConfigure, final Stereotype stereotype, final Type type, final FeatureValue featureValue) {
-
-		Object result = new ApplyStereotypeAdviceConfigurationSwitch<Object>() {
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseConstantValue(ConstantValue object) {
-				ValueSpecification valueSpecification = object.getValueInstance();
-
-				if (valueSpecification == null) {
-					return null;
-				}
-
-				try {
-					if (type instanceof PrimitiveType) {
-						final PrimitiveType pType = (PrimitiveType) type;
-						final String name = pType.getName();
-						if (PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {
-							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);
-						} else if (PrimitivesTypesUtils.UML_INTEGER.equals(name)) {
-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
-						} else if (PrimitivesTypesUtils.UML_REAL.equals(name)) {
-							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);
-						} else if (PrimitivesTypesUtils.UML_STRING.equals(name)) {
-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
-						} else if (PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name)) {
-							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);
-						} else { // custom PrimitiveType
-							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
-						}
-					} else if (type instanceof Enumeration) {
-						return ConverterRegistry.getSingleton().convert(Enumeration.class, valueSpecification);
-					} else if (type instanceof DataType) {// FIXME manage the data type
-						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);
-					}
-				} catch (ConverterNotfoundException e) {
-					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + type, e);
-				}
-				return super.caseConstantValue(object);
-			}
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseQueryExecutionValue(QueryExecutionValue object) {
-				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");
-			};
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseDynamicValue(DynamicValue object) {
-				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");
-			};
-
-			/**
-			 * {@inheritDoc}
-			 */
-			@Override
-			public Object caseListValue(ListValue object) {
-				// resolve one by one all features in the values list of this listvalue
-				List<Object> results = new ArrayList<Object>();
-				for (FeatureValue value : object.getValues()) {
-					Object singleResult = getValue(elementToConfigure, stereotype, type, value);
-					results.add(singleResult);
-				}
-				return results;
-			};
-
-		}.doSwitch(featureValue);
-		return result;
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.advices.applystereotype;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.papyrus.infra.emf.types.converter.ConverterNotfoundException;

+import org.eclipse.papyrus.infra.emf.types.converter.ConverterRegistry;

+import org.eclipse.papyrus.uml.tools.utils.PrimitivesTypesUtils;

+import org.eclipse.papyrus.uml.types.core.Activator;

+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.util.ApplyStereotypeAdviceSwitch;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.Stereotype;

+import org.eclipse.uml2.uml.Type;

+import org.eclipse.uml2.uml.ValueSpecification;

+

+

+/**

+ * Utility class to get values from a {@link FeatureValue}

+ */

+public class StereotypeFeatureValueUtils {

+

+	protected StereotypeFeatureValueUtils() {

+		// no instanciation, helper class

+	}

+

+	/**

+	 * Returns the value to set for a given feature of a given element

+	 * 

+	 * @param elementToConfigure

+	 *            eobject for which feature is set. This must not be <code>null</code>

+	 * @param feature

+	 *            {@link EStructuralFeature} to set. This must not be <code>null</code>

+	 * @param valueModel

+	 *            configuration of the value, stored in the model

+	 * @return the real value that will be set to the object or <code>null</code> if none could be computed

+	 */

+	public static Object getValue(final EObject elementToConfigure, final Stereotype stereotype, final Type type, final FeatureValue featureValue) {

+

+		Object result = new ApplyStereotypeAdviceSwitch<Object>() {

+			/**

+			 * {@inheritDoc}

+			 */

+			@Override

+			public Object caseConstantValue(ConstantValue object) {

+				ValueSpecification valueSpecification = object.getValueInstance();

+

+				if (valueSpecification == null) {

+					return null;

+				}

+

+				try {

+					if (type instanceof PrimitiveType) {

+						final PrimitiveType pType = (PrimitiveType) type;

+						final String name = pType.getName();

+						if (PrimitivesTypesUtils.UML_BOOLEAN.equals(name)) {

+							return ConverterRegistry.getSingleton().convert(boolean.class, valueSpecification);

+						} else if (PrimitivesTypesUtils.UML_INTEGER.equals(name)) {

+							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

+						} else if (PrimitivesTypesUtils.UML_REAL.equals(name)) {

+							return ConverterRegistry.getSingleton().convert(double.class, valueSpecification);

+						} else if (PrimitivesTypesUtils.UML_STRING.equals(name)) {

+							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

+						} else if (PrimitivesTypesUtils.UML_UNLIMITED_NATURAL.equals(name)) {

+							return ConverterRegistry.getSingleton().convert(int.class, valueSpecification);

+						} else { // custom PrimitiveType

+							return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

+						}

+					} else if (type instanceof Enumeration) {

+						return ConverterRegistry.getSingleton().convert(Enumeration.class, valueSpecification);

+					} else if (type instanceof DataType) {// FIXME manage the data type

+						return ConverterRegistry.getSingleton().convert(String.class, valueSpecification);

+					}

+				} catch (ConverterNotfoundException e) {

+					Activator.log.error("Impossible to convert " + valueSpecification + " to fit feature type :" + type, e);

+				}

+				return super.caseConstantValue(object);

+			}

+

+			/**

+			 * {@inheritDoc}

+			 */

+			@Override

+			public Object caseQueryExecutionValue(QueryExecutionValue object) {

+				throw new UnsupportedOperationException("Query execution values resolution has not been implemented yet");

+			};

+

+			/**

+			 * {@inheritDoc}

+			 */

+			@Override

+			public Object caseDynamicValue(DynamicValue object) {

+				throw new UnsupportedOperationException("Dynamic values resolution has not been implemented yet");

+			};

+

+			/**

+			 * {@inheritDoc}

+			 */

+			@Override

+			public Object caseListValue(ListValue object) {

+				// resolve one by one all features in the values list of this listvalue

+				List<Object> results = new ArrayList<Object>();

+				for (FeatureValue value : object.getValues()) {

+					Object singleResult = getValue(elementToConfigure, stereotype, type, value);

+					results.add(singleResult);

+				}

+				return results;

+			};

+

+		}.doSwitch(featureValue);

+		return result;

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceEditHelperAdvice.java
index 1b0234dc73a..8f0778012a7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceEditHelperAdvice.java
@@ -1,116 +1,116 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
-
-import java.util.Arrays;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.Activator;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * advice for the {@link ApplyStereotypeAdviceConfiguration}
- */
-public class SetTypeAdviceEditHelperAdvice extends AbstractEditHelperAdvice {
-
-	protected SetTypeAdviceConfiguration configuration;
-
-	public SetTypeAdviceEditHelperAdvice(SetTypeAdviceConfiguration configuration) {
-		this.configuration = configuration;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-		return super.approveRequest(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {
-		return super.getBeforeConfigureCommand(request);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {
-		if (configuration == null) {
-			return null;
-		}
-		ICommand resultCommand = null;
-		// retrieve eobject
-		final EObject elementToConfigure = request.getElementToConfigure();
-		if (!(elementToConfigure instanceof Element)) {
-			return null;
-		}
-
-		final TransactionalEditingDomain editingDomain = request.getEditingDomain();
-		if (editingDomain == null) {
-			return null;
-		}
-		// retrieve edit service to get features from configure command
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);
-		if (service == null) {
-			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);
-			return null;
-		}
-
-		resultCommand = new AbstractTransactionalCommand(editingDomain, "Editing type", Arrays.asList((WorkspaceSynchronizer.getFile(elementToConfigure.eResource())))) {
-
-			@Override
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				UMLModelElement umlModelElement = new UMLModelElement(elementToConfigure, editingDomain);
-				ReferenceValueFactory factory = umlModelElement.getValueFactory("type");
-				Object elemObject = factory.edit(Display.getDefault().getFocusControl(), elementToConfigure);
-				return CommandResult.newOKCommandResult(elemObject);
-			}
-		};
-
-		return resultCommand;
-	}
-
-	/**
-	 * @return
-	 */
-	protected EObject getDefaultTypeContainer(ConfigureRequest request) {
-		if (request.getElementToConfigure() instanceof Element) {
-			return ((Element) request.getElementToConfigure()).getNearestPackage();
-		}
-		return request.getElementToConfigure().eContainer();
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.advices.settype;

+

+import java.util.Arrays;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

+import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;

+import org.eclipse.papyrus.uml.types.core.Activator;

+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.uml2.uml.Element;

+

+/**

+ * advice for the {@link ApplyStereotypeAdviceConfiguration}

+ */

+public class SetTypeAdviceEditHelperAdvice extends AbstractEditHelperAdvice {

+

+	protected SetTypeAdviceConfiguration configuration;

+

+	public SetTypeAdviceEditHelperAdvice(SetTypeAdviceConfiguration configuration) {

+		this.configuration = configuration;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public boolean approveRequest(IEditCommandRequest request) {

+		return super.approveRequest(request);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getBeforeConfigureCommand(ConfigureRequest request) {

+		return super.getBeforeConfigureCommand(request);

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected ICommand getAfterConfigureCommand(ConfigureRequest request) {

+		if (configuration == null) {

+			return null;

+		}

+		ICommand resultCommand = null;

+		// retrieve eobject

+		final EObject elementToConfigure = request.getElementToConfigure();

+		if (!(elementToConfigure instanceof Element)) {

+			return null;

+		}

+

+		final TransactionalEditingDomain editingDomain = request.getEditingDomain();

+		if (editingDomain == null) {

+			return null;

+		}

+		// retrieve edit service to get features from configure command

+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(elementToConfigure);

+		if (service == null) {

+			Activator.log.error("Impossible to get edit service from element: " + elementToConfigure, null);

+			return null;

+		}

+

+		resultCommand = new AbstractTransactionalCommand(editingDomain, "Editing type", Arrays.asList((WorkspaceSynchronizer.getFile(elementToConfigure.eResource())))) {

+

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				UMLModelElement umlModelElement = new UMLModelElement(elementToConfigure, editingDomain);

+				ReferenceValueFactory factory = umlModelElement.getValueFactory("type");

+				Object elemObject = factory.edit(Display.getDefault().getFocusControl(), elementToConfigure);

+				return CommandResult.newOKCommandResult(elemObject);

+			}

+		};

+

+		return resultCommand;

+	}

+

+	/**

+	 * @return

+	 */

+	protected EObject getDefaultTypeContainer(ConfigureRequest request) {

+		if (request.getElementToConfigure() instanceof Element) {

+			return ((Element) request.getElementToConfigure()).getNearestPackage();

+		}

+		return request.getElementToConfigure().eContainer();

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceFactory.java
index 5dd70631439..8e28cd842e8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/settypeadviceconfiguration/SetTypeAdviceFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/advices/settype/SetTypeAdviceFactory.java
@@ -1,33 +1,34 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.settypeadviceconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.impl.AbstractAdviceBindingFactory;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.NullEditHelperAdvice;
-
-public class SetTypeAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {
-
-
-	@Override
-	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {
-		if (adviceConfiguration instanceof SetTypeAdviceConfiguration) {
-			IEditHelperAdvice editHelperAdvice = new SetTypeAdviceEditHelperAdvice((SetTypeAdviceConfiguration) adviceConfiguration);
-			return editHelperAdvice;
-		}
-		return NullEditHelperAdvice.getInstance();
-	}
-
-
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.advices.settype;

+

+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;

+import org.eclipse.papyrus.infra.types.core.factories.impl.AbstractAdviceBindingFactory;

+import org.eclipse.papyrus.infra.types.core.impl.NullEditHelperAdvice;

+

+

+public class SetTypeAdviceFactory extends AbstractAdviceBindingFactory<AbstractAdviceBindingConfiguration> {

+

+

+	@Override

+	protected IEditHelperAdvice getEditHelperAdvice(AbstractAdviceBindingConfiguration adviceConfiguration) {

+		if (adviceConfiguration instanceof SetTypeAdviceConfiguration) {

+			IEditHelperAdvice editHelperAdvice = new SetTypeAdviceEditHelperAdvice((SetTypeAdviceConfiguration) adviceConfiguration);

+			return editHelperAdvice;

+		}

+		return NullEditHelperAdvice.getInstance();

+	}

+

+

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/AbstractProfilingCommand.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/AbstractProfilingCommand.java
index b967dd1822b..ff999b80ca8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/AbstractProfilingCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/AbstractProfilingCommand.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+package org.eclipse.papyrus.uml.types.core.commands;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyProfileCommand.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/ApplyProfileCommand.java
index 096a2cd00d0..a8086194c28 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyProfileCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/ApplyProfileCommand.java
@@ -11,14 +11,14 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+package org.eclipse.papyrus.uml.types.core.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyProfileRequest;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Profile;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyStereotypeCommand.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/ApplyStereotypeCommand.java
index 197f8068172..7746fdaeac9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/ApplyStereotypeCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/ApplyStereotypeCommand.java
@@ -11,14 +11,14 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+package org.eclipse.papyrus.uml.types.core.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Stereotype;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/SetStereotypeValueCommand.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/SetStereotypeValueCommand.java
index 2c24d34d04c..ee448d48ebe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/SetStereotypeValueCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/SetStereotypeValueCommand.java
@@ -11,14 +11,14 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+package org.eclipse.papyrus.uml.types.core.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Stereotype;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyProfileCommand.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/UnapplyProfileCommand.java
index 4d1b2c79557..fc1ed93d935 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyProfileCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/UnapplyProfileCommand.java
@@ -11,14 +11,14 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+package org.eclipse.papyrus.uml.types.core.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyProfileRequest;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Profile;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyStereotypeCommand.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/UnapplyStereotypeCommand.java
index be159c453c4..68c69da2839 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/commands/UnapplyStereotypeCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/commands/UnapplyStereotypeCommand.java
@@ -11,14 +11,14 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.commands;
+package org.eclipse.papyrus.uml.types.core.commands;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyStereotypeRequest;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Stereotype;
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/edithelper/DefaultUMLEditHelper.java
index 931cbc9f6c0..e632ec712d2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/edithelper/DefaultUMLEditHelper.java
@@ -11,21 +11,21 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper;
+package org.eclipse.papyrus.uml.types.core.edithelper;
 
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.ApplyProfileCommand;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.ApplyStereotypeCommand;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.SetStereotypeValueCommand;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.UnapplyProfileCommand;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.commands.UnapplyStereotypeCommand;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.commands.ApplyProfileCommand;
+import org.eclipse.papyrus.uml.types.core.commands.ApplyStereotypeCommand;
+import org.eclipse.papyrus.uml.types.core.commands.SetStereotypeValueCommand;
+import org.eclipse.papyrus.uml.types.core.commands.UnapplyProfileCommand;
+import org.eclipse.papyrus.uml.types.core.commands.UnapplyStereotypeCommand;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyStereotypeRequest;
 
 public class DefaultUMLEditHelper extends DefaultEditHelper {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/edithelper/DefaultUMLEditHelperAdvice.java
index 4d3f1a18c0f..f81614f84c4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/edithelper/DefaultUMLEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/edithelper/DefaultUMLEditHelperAdvice.java
@@ -11,16 +11,16 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.edithelper;
+package org.eclipse.papyrus.uml.types.core.edithelper;
 
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyStereotypeRequest;
 
 public class DefaultUMLEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcher.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcher.java
index d7af16b11f8..84ba0644c16 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcher.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcher.java
@@ -10,7 +10,7 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
+package org.eclipse.papyrus.uml.types.core.matchers.stereotype;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,22 +51,22 @@ public class StereotypeApplicationMatcher implements IElementMatcher {
 				return false;
 			}
 		}
-		
-		if (profileUri != null){
+
+		if (profileUri != null) {
 			Model model = element.getModel();
-			if (model == null){
+			if (model == null) {
 				return false;
 			}
-			
-			List<String> appliedProfileByUri = new ArrayList<String>();			
+
+			List<String> appliedProfileByUri = new ArrayList<String>();
 			for (Profile appliedProfile : model.getAllAppliedProfiles()) {
 				appliedProfileByUri.add(appliedProfile.getURI());
 			}
-			
-			if (!appliedProfileByUri.contains(profileUri)){
+
+			if (!appliedProfileByUri.contains(profileUri)) {
 				return false;
 			}
-						
+
 		}
 		return true;
 	}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherFactory.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherConfigurationFactory.java
index 0bd33486693..16c619bf473 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/stereotypeapplicationmatcherconfiguration/StereotypeApplicationMatcherFactory.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/matchers/stereotype/StereotypeApplicationMatcherConfigurationFactory.java
@@ -1,30 +1,31 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.factories.IMatcherFactory;
-
-
-/**
- * Factory to create matcher based on stereotypes applied on the element
- */
-public class StereotypeApplicationMatcherFactory implements IMatcherFactory<StereotypeApplicationMatcherConfiguration> {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public IElementMatcher createElementMatcher(StereotypeApplicationMatcherConfiguration configuration) {
-		return new StereotypeApplicationMatcher(configuration);
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.matchers.stereotype;

+

+import org.eclipse.gmf.runtime.emf.type.core.IElementMatcher;

+import org.eclipse.papyrus.infra.types.core.factories.IMatcherFactory;

+

+

+

+/**

+ * Factory to create matcher based on stereotypes applied on the element

+ */

+public class StereotypeApplicationMatcherConfigurationFactory implements IMatcherFactory<StereotypeApplicationMatcherConfiguration> {

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public IElementMatcher createElementMatcher(StereotypeApplicationMatcherConfiguration configuration) {

+		return new StereotypeApplicationMatcher(configuration);

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractProfileRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/AbstractProfileRequest.java
index bcca470441d..83c2fb1e7ad 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractProfileRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/AbstractProfileRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractStereotypeRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/AbstractStereotypeRequest.java
index e07a1ac5f83..c51be13d0d3 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/AbstractStereotypeRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/AbstractStereotypeRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyProfileRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/ApplyProfileRequest.java
index 8786934fca6..c80aed577fe 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyProfileRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/ApplyProfileRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.uml2.uml.Package;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyStereotypeRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/ApplyStereotypeRequest.java
index 675d4fd5730..2f670af4163 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/ApplyStereotypeRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/ApplyStereotypeRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.uml2.uml.Element;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/SetStereotypeValueRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/SetStereotypeValueRequest.java
index 3f40328ba62..d18f6f7c299 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/SetStereotypeValueRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/SetStereotypeValueRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyProfileRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/UnapplyProfileRequest.java
index ddde7b8ca8e..3813bb28077 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyProfileRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/UnapplyProfileRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.uml2.uml.Package;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyStereotypeRequest.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/UnapplyStereotypeRequest.java
index d2893c8cd1b..6c37a93c218 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/requests/UnapplyStereotypeRequest.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/requests/UnapplyStereotypeRequest.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.elementtypesconfigurations.requests;
+package org.eclipse.papyrus.uml.types.core.requests;
 
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.uml2.uml.Element;
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/umlinvariantrule/AbstractUmlInvariantRule.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/AbstractUmlRule.java
index 888f4e4cc75..1844c6d03be 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/umlinvariantrule/AbstractUmlInvariantRule.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/AbstractUmlRule.java
@@ -1,93 +1,94 @@
-/*****************************************************************************
- * Copyright (c) 2014 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypeconfiguration.InvariantRuleConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
-
-public abstract class AbstractUmlInvariantRule<T extends InvariantRuleConfiguration> extends AbstractInvariantRule<T> {
-	protected T invariantRuleConfiguration;
-
-	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
-	 *
-	 * @param request
-	 * @return
-	 */
-	@Override
-	public boolean approveRequest(IEditCommandRequest request) {
-
-		List<?> elementsToEdit = request.getElementsToEdit();
-		for (Object elementToEdit : elementsToEdit) {
-			if (elementToEdit instanceof EObject) {
-				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) elementToEdit, request.getClientContext());
-
-				for (IElementType type : types) {
-					if (type instanceof ConfiguredHintedSpecializationElementType) {
-						ConfiguredHintedSpecializationElementType configuredHintedSpecializationElementType = (ConfiguredHintedSpecializationElementType) type;
-						if (request instanceof ApplyStereotypeRequest) {
-							if (!approveApplyStereotypeRequest(configuredHintedSpecializationElementType, (ApplyStereotypeRequest) request)) {
-								return false;
-							}
-						} else if (request instanceof UnapplyStereotypeRequest) {
-							if (!approveUnapplyStereotypeRequest(configuredHintedSpecializationElementType, (UnapplyStereotypeRequest) request)) {
-								return false;
-							}
-						} else if (request instanceof ApplyProfileRequest) {
-							if (!approveApplyProfileRequest(configuredHintedSpecializationElementType, (ApplyProfileRequest) request)) {
-								return false;
-							}
-						} else if (request instanceof UnapplyProfileRequest) {
-							if (!approveUnapplyProfileRequest(configuredHintedSpecializationElementType, (UnapplyProfileRequest) request)) {
-								return false;
-							}
-						} else if (request instanceof SetStereotypeValueRequest) {
-							if (!approveSetStereotypeValueRequest(configuredHintedSpecializationElementType, (SetStereotypeValueRequest) request)) {
-								return false;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return super.approveRequest(request);
-	}
-
-	abstract protected boolean approveApplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, ApplyStereotypeRequest request);
-
-	abstract protected boolean approveUnapplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, UnapplyStereotypeRequest request);
-
-	abstract protected boolean approveApplyProfileRequest(ConfiguredHintedSpecializationElementType type, ApplyProfileRequest request);
-
-	abstract protected boolean approveUnapplyProfileRequest(ConfiguredHintedSpecializationElementType type, UnapplyProfileRequest request);
-
-	abstract protected boolean approveSetStereotypeValueRequest(ConfiguredHintedSpecializationElementType type, SetStereotypeValueRequest request);
-
-	@Override
-	public void init(T invariantRuleConfiguration) {
-		this.invariantRuleConfiguration = invariantRuleConfiguration;
-	}
-}
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.types.core.rules;

+

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;

+import org.eclipse.papyrus.infra.types.rulebased.RuleConfiguration;

+import org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule;

+import org.eclipse.papyrus.uml.types.core.requests.ApplyProfileRequest;

+import org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest;

+import org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest;

+import org.eclipse.papyrus.uml.types.core.requests.UnapplyProfileRequest;

+import org.eclipse.papyrus.uml.types.core.requests.UnapplyStereotypeRequest;

+

+public abstract class AbstractUmlRule<T extends RuleConfiguration> extends AbstractRule<T> {

+	protected T invariantRuleConfiguration;

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)

+	 *

+	 * @param request

+	 * @return

+	 */

+	@Override

+	public boolean approveRequest(IEditCommandRequest request) {

+

+		List<?> elementsToEdit = request.getElementsToEdit();

+		for (Object elementToEdit : elementsToEdit) {

+			if (elementToEdit instanceof EObject) {

+				IElementType[] types = ElementTypeRegistry.getInstance().getAllTypesMatching((EObject) elementToEdit, request.getClientContext());

+

+				for (IElementType type : types) {

+					if (type instanceof ConfiguredHintedSpecializationElementType) {

+						ConfiguredHintedSpecializationElementType configuredHintedSpecializationElementType = (ConfiguredHintedSpecializationElementType) type;

+						if (request instanceof ApplyStereotypeRequest) {

+							if (!approveApplyStereotypeRequest(configuredHintedSpecializationElementType, (ApplyStereotypeRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof UnapplyStereotypeRequest) {

+							if (!approveUnapplyStereotypeRequest(configuredHintedSpecializationElementType, (UnapplyStereotypeRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof ApplyProfileRequest) {

+							if (!approveApplyProfileRequest(configuredHintedSpecializationElementType, (ApplyProfileRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof UnapplyProfileRequest) {

+							if (!approveUnapplyProfileRequest(configuredHintedSpecializationElementType, (UnapplyProfileRequest) request)) {

+								return false;

+							}

+						} else if (request instanceof SetStereotypeValueRequest) {

+							if (!approveSetStereotypeValueRequest(configuredHintedSpecializationElementType, (SetStereotypeValueRequest) request)) {

+								return false;

+							}

+						}

+					}

+				}

+			}

+		}

+

+		return super.approveRequest(request);

+	}

+

+	abstract protected boolean approveApplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, ApplyStereotypeRequest request);

+

+	abstract protected boolean approveUnapplyStereotypeRequest(ConfiguredHintedSpecializationElementType type, UnapplyStereotypeRequest request);

+

+	abstract protected boolean approveApplyProfileRequest(ConfiguredHintedSpecializationElementType type, ApplyProfileRequest request);

+

+	abstract protected boolean approveUnapplyProfileRequest(ConfiguredHintedSpecializationElementType type, UnapplyProfileRequest request);

+

+	abstract protected boolean approveSetStereotypeValueRequest(ConfiguredHintedSpecializationElementType type, SetStereotypeValueRequest request);

+

+	@Override

+	public void init(T invariantRuleConfiguration) {

+		this.invariantRuleConfiguration = invariantRuleConfiguration;

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRule.java b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRule.java
index 9509e98a5e1..66cc66477bc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/src/org/eclipse/papyrus/uml/elementtypesconfigurations/invariantstereotyperuleconfiguration/InvariantStereotypeRule.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/src/org/eclipse/papyrus/uml/types/core/rules/invariantstereotype/InvariantStereotypeRule.java
@@ -10,29 +10,30 @@
  *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.uml.elementtypesconfigurations.invariantstereotyperuleconfiguration;
+package org.eclipse.papyrus.uml.types.core.rules.invariantstereotype;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule;
+import org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyProfileRequest;
+import org.eclipse.papyrus.uml.types.core.requests.UnapplyStereotypeRequest;
+import org.eclipse.papyrus.uml.types.core.rules.AbstractUmlRule;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.Stereotype;
 
-public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantStereotypeRuleConfiguration> {
+public class InvariantStereotypeRule extends AbstractUmlRule<InvariantStereotypeRuleConfiguration> {
 
 	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.IInvariantRule#matches(org.eclipse.emf.ecore.EObject)
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.IRule#matches(org.eclipse.emf.ecore.EObject)
 	 *
 	 * @param eObject
 	 * @return
@@ -62,8 +63,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule#approveMoveRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest)
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule#approveMoveRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -75,8 +76,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule#approveSetRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule#approveSetRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -88,8 +89,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes.invarianttypeconfiguration.AbstractInvariantRule#approveCreationRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)
+	 * 
+	 * @see org.eclipse.papyrus.infra.types.rulebased.core.AbstractRule#approveCreationRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -117,8 +118,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveApplyStereotypeRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyStereotypeRequest)
+	 * 
+	 * @see org.eclipse.papyrus.uml.types.core.rules.AbstractUmlRule#approveApplyStereotypeRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.papyrus.uml.types.core.requests.ApplyStereotypeRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -130,8 +131,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveUnapplyStereotypeRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyStereotypeRequest)
+	 * 
+	 * @see org.eclipse.papyrus.uml.types.core.rules.AbstractUmlRule#approveUnapplyStereotypeRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.papyrus.uml.types.core.requests.UnapplyStereotypeRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -147,8 +148,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveApplyProfileRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.ApplyProfileRequest)
+	 * 
+	 * @see org.eclipse.papyrus.uml.types.core.rules.AbstractUmlRule#approveApplyProfileRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.papyrus.uml.types.core.requests.ApplyProfileRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -160,8 +161,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveUnapplyProfileRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.UnapplyProfileRequest)
+	 * 
+	 * @see org.eclipse.papyrus.uml.types.core.rules.AbstractUmlRule#approveUnapplyProfileRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.papyrus.uml.types.core.requests.UnapplyProfileRequest)
 	 *
 	 * @param type
 	 * @param request
@@ -178,8 +179,8 @@ public class InvariantStereotypeRule extends AbstractUmlInvariantRule<InvariantS
 	}
 
 	/**
-	 * @see org.eclipse.papyrus.uml.elementtypesconfigurations.umlinvariantrule.AbstractUmlInvariantRule#approveSetStereotypeValueRequest(org.eclipse.papyrus.infra.elementtypesconfigurations.impl.ConfiguredHintedSpecializationElementType,
-	 *      org.eclipse.papyrus.uml.elementtypesconfigurations.requests.SetStereotypeValueRequest)
+	 * 
+	 * @see org.eclipse.papyrus.uml.types.core.rules.AbstractUmlRule#approveSetStereotypeValueRequest(org.eclipse.papyrus.infra.types.core.impl.ConfiguredHintedSpecializationElementType, org.eclipse.papyrus.uml.types.core.requests.SetStereotypeValueRequest)
 	 *
 	 * @param type
 	 * @param request
diff --git a/plugins/uml/pom.xml b/plugins/uml/pom.xml
index e67f646e11c..655c4aa1816 100644
--- a/plugins/uml/pom.xml
+++ b/plugins/uml/pom.xml
@@ -16,7 +16,7 @@
 		<module>org.eclipse.papyrus.uml.commands</module>
 		<module>org.eclipse.papyrus.uml.controlmode.profile</module>
 		<module>org.eclipse.papyrus.uml.documentation.profile</module>
-		<module>org.eclipse.papyrus.uml.elementtypesconfigurations</module>
+		<module>org.eclipse.papyrus.uml.types.core</module>
 		<module>org.eclipse.papyrus.uml.extensionpoints</module>
 		<module>org.eclipse.papyrus.uml.filters</module>
 		<module>org.eclipse.papyrus.uml.filters.edit</module>
diff --git a/releng/main-tests/pom.xml b/releng/main-tests/pom.xml
index 0e43aa33687..546106e6e46 100644
--- a/releng/main-tests/pom.xml
+++ b/releng/main-tests/pom.xml
@@ -38,8 +38,8 @@
 		<module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests</module>
 		<module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests</module>
 		<module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.ui.tests</module>
-		<module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests</module>
-		<module>../../tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests</module>
+		<module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests</module>
+		<module>../../tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests</module>
 		<module>../../tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests</module>
 		<module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.filters.tests</module>
 		<module>../../tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests</module>
@@ -71,7 +71,7 @@
 		<module>../../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests</module>
 		<module>../../tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests</module>
 		<module>../../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests</module>
-		<module>../../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests</module>
+		<module>../../tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests</module>
 		<module>../../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests</module>
 		<module>../../tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests</module>
 		<module>../../tests/junit/plugins/uml/diagram</module>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.project
deleted file mode 100644
index 34d625c0ad2..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 6b9f1a116c7..b5719b121b8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -43,7 +43,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.extendedtypes.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
@@ -88,7 +88,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.ui.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.extendedtypes.ui.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 80e1ab33e27..ea04f97cb75 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -60,8 +60,8 @@ public class AllTests {
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.ui.internal.emf.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.ui.emf.tests.AllTests"));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.extendedtypes.ui.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.ui.tests.AllTests.class));
 		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.commands.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests"));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.Activator.ID, "org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests"));
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
index 4d9c4b9489f..c623666ed8f 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0"

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0"

 Bundle-Vendor: %providerName

 Fragment-Host: org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"

 Bundle-Version: 1.2.0.qualifier

diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java
index 340a6fdbd61..158a001365e 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/tests/AllTests.java
@@ -13,11 +13,11 @@
  */
 package org.eclipse.papyrus.infra.emf.tests;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.emf.advice.ReadOnlyObjectEditAdviceTest;
 import org.eclipse.papyrus.infra.emf.edit.domain.PapyrusTransactionalEditingDomainTest;
 import org.eclipse.papyrus.infra.emf.resource.index.WorkspaceModelIndexTest;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceTest;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
 import org.eclipse.papyrus.junit.framework.runner.Headless;
 import org.junit.BeforeClass;
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
index f1fcde4b69b..5ac349845fb 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

  com.google.guava;bundle-version="11.0.0",

  org.eclipse.gef;bundle-version="3.10.0",

diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
index f2b9d9b3e18..8b23ee924c2 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-all.elementtypesconfigurations
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" xmi:version="2.0">
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean" xmi:id="_JHkF8Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_JHkF8pg0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkF85g0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder" xmi:id="_JHkF9Jg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkF9pg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import" xmi:id="_JHkF95g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="UML::Association" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web" xmi:id="_JHkF-pg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_JHkF-5g0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.User" name="User" xmi:id="_JHkF_Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkF_pg0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkF_5g0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser" xmi:id="_JHkGAJg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkGAZg0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkGApg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint" xmi:id="_JHkGA5g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_JHkGBJg0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkGBZg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario" xmi:id="_JHkGBpg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_JHkGB5g0EeSrbqbUdG1DAA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>
-    <matcherConfiguration xmi:id="_JHkGCJg0EeSrbqbUdG1DAA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.bean" target="_JHkF8Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Bean" updateName="true" xmi:id="_JHkGCpg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.finder" target="_JHkF9Jg0EeSrbqbUdG1DAA" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Finder" updateName="true" xmi:id="_JHkGDJg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import" target="_JHkF95g0EeSrbqbUdG1DAA" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_JHkGDpg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web" target="_JHkF-pg0EeSrbqbUdG1DAA" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_JHkGEJg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user" target="_JHkF_Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_JHkGEpg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser" target="_JHkGAJg0EeSrbqbUdG1DAA" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_JHkGFJg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="_JHkGA5g0EeSrbqbUdG1DAA" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_JHkGFpg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="_JHkGBpg0EeSrbqbUdG1DAA" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_JHkGGJg0EeSrbqbUdG1DAA">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_JHkF8Jg0EeSrbqbUdG1DAA" xmi:version="2.0">

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Bean" name="Bean" xmi:id="_JHkF8Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_JHkF8pg0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkF85g0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Bean</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Finder" name="Finder" xmi:id="_JHkF9Jg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif" xmi:id="_JHkF9Zg0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Operation</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkF9pg0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Finder</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Import" name="Import" xmi:id="_JHkF95g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_JHkF-Jg0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkF-Zg0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="UML::Association" identifier="org.eclipse.papyrus.example.j2ee.Web" name="Web" xmi:id="_JHkF-pg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_JHkF-5g0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkF_Jg0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.User" name="User" xmi:id="_JHkF_Zg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkF_pg0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkF_5g0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.Browser" name="Browser" xmi:id="_JHkGAJg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_JHkGAZg0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Actor</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkGApg0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.BranchPoint" name="BranchPoint" xmi:id="_JHkGA5g0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_JHkGBJg0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.ExtensionPoint</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkGBZg0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.example.j2ee.WebScenario" name="WebScenario" xmi:id="_JHkGBpg0EeSrbqbUdG1DAA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_JHkGB5g0EeSrbqbUdG1DAA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.UseCase</specializedTypesID>

+    <matcherConfiguration xmi:id="_JHkGCJg0EeSrbqbUdG1DAA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.bean" target="_JHkF8Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGCZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Bean" updateName="true" xmi:id="_JHkGCpg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.finder" target="_JHkF9Jg0EeSrbqbUdG1DAA" xmi:id="_JHkGC5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Finder" updateName="true" xmi:id="_JHkGDJg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import" target="_JHkF95g0EeSrbqbUdG1DAA" xmi:id="_JHkGDZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_JHkGDpg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web" target="_JHkF-pg0EeSrbqbUdG1DAA" xmi:id="_JHkGD5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_JHkGEJg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user" target="_JHkF_Zg0EeSrbqbUdG1DAA" xmi:id="_JHkGEZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_JHkGEpg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser" target="_JHkGAJg0EeSrbqbUdG1DAA" xmi:id="_JHkGE5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_JHkGFJg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint" target="_JHkGA5g0EeSrbqbUdG1DAA" xmi:id="_JHkGFZg0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_JHkGFpg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario" target="_JHkGBpg0EeSrbqbUdG1DAA" xmi:id="_JHkGF5g0EeSrbqbUdG1DAA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_JHkGGJg0EeSrbqbUdG1DAA">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
index d2010af4d3c..2ef8577d458 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/resources/j2ee-usecase.elementtypesconfigurations
@@ -1,182 +1,182 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" xmi:version="2.0">
-  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_PDKkspgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKks5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_PDKktZgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Association_4011</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKktpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKku5gTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkypgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKky5gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk05gTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKk15gTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014</specializedTypesID>
-    <matcherConfiguration xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_PDKk35gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk45gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk55gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk65gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk75gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk85gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk95gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ">
-      <requiredProfiles>j2ee</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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.example.j2ee.elementTypes" metamodelNsURI="j2ee" name="j2ee" xmi:id="_PDKksJgTEeSXtOdwR_uKBQ" xmi:version="2.0">

+  <elementTypeConfigurations hint="4013" identifier="org.eclipse.papyrus.example.j2ee.Import_4013" name="Import" xmi:id="_PDKksZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif" xmi:id="_PDKkspgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Dependency_4013</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKks5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Import</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="4011" identifier="org.eclipse.papyrus.example.j2ee.Web_4011" name="Web" xmi:id="_PDKktJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif" xmi:id="_PDKktZgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Association_4011</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKktpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Web</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.User_3018" name="User (3018)" xmi:id="_PDKkt5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkuJgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkuZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.User_3011" name="User (3011)" xmi:id="_PDKkupgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKku5gTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkvJgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.User_2011" name="User (2011)" xmi:id="_PDKkvZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkvpgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkv5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.User_2012" name="User (2012)" xmi:id="_PDKkwJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkwZgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkwpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::User</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3018" identifier="org.eclipse.papyrus.example.j2ee.Browser_3018" name="Browser (3018)" xmi:id="_PDKkw5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkxJgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3018</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkxZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3011" identifier="org.eclipse.papyrus.example.j2ee.Browser_3011" name="Browser (3011)" xmi:id="_PDKkxpgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkx5gTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_3011</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkyJgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2011" identifier="org.eclipse.papyrus.example.j2ee.Browser_2011" name="Browser (2011)" xmi:id="_PDKkyZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkypgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2011</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKky5gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2012" identifier="org.eclipse.papyrus.example.j2ee.Browser_2012" name="Browser (2012)" xmi:id="_PDKkzJgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif" xmi:id="_PDKkzZgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.Actor_2012</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKkzpgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::Browser</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3007" name="BranchPoint (3007)" xmi:id="_PDKkz5gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk0JgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3007</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKk0ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3008" identifier="org.eclipse.papyrus.example.j2ee.BranchPoint_3008" name="BranchPoint (3008)" xmi:id="_PDKk0pgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif" xmi:id="_PDKk05gTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.ExtensionPoint_3008</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKk1JgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::BranchPoint</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="3012" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_3012" name="WebScenario (3012)" xmi:id="_PDKk1ZgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk1pgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_3012</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKk15gTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2013" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2013" name="WebScenario (2013)" xmi:id="_PDKk2JgTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk2ZgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2013</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKk2pgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="2014" identifier="org.eclipse.papyrus.example.j2ee.WebScenario_2014" name="WebScenario (2014)" xmi:id="_PDKk25gTEeSXtOdwR_uKBQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif" xmi:id="_PDKk3JgTEeSXtOdwR_uKBQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.diagram.usecase.UseCase_2014</specializedTypesID>

+    <matcherConfiguration xmi:id="_PDKk3ZgTEeSXtOdwR_uKBQ" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>j2ee::WebScenario</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.import_4013" target="_PDKksZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk3pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Import" updateName="true" xmi:id="_PDKk35gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.web_4011" target="_PDKktJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk4JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Web" updateName="true" xmi:id="_PDKk4ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3018" target="_PDKkt5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk4pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk45gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_3011" target="_PDKkupgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk5ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2011" target="_PDKkvZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk5pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk55gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.user_2012" target="_PDKkwJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk6JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::User" updateName="true" xmi:id="_PDKk6ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3018" target="_PDKkw5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk6pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk65gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_3011" target="_PDKkxpgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk7ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2011" target="_PDKkyZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk7pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk75gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.browser_2012" target="_PDKkzJgTEeSXtOdwR_uKBQ" xmi:id="_PDKk8JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::Browser" updateName="true" xmi:id="_PDKk8ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3007" target="_PDKkz5gTEeSXtOdwR_uKBQ" xmi:id="_PDKk8pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk85gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.branchPoint_3008" target="_PDKk0pgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::BranchPoint" updateName="true" xmi:id="_PDKk9ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_3012" target="_PDKk1ZgTEeSXtOdwR_uKBQ" xmi:id="_PDKk9pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk95gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2013" target="_PDKk2JgTEeSXtOdwR_uKBQ" xmi:id="_PDKk-JgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-ZgTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.example.j2ee.webScenario_2014" target="_PDKk25gTEeSXtOdwR_uKBQ" xmi:id="_PDKk-pgTEeSXtOdwR_uKBQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="j2ee::WebScenario" updateName="true" xmi:id="_PDKk-5gTEeSXtOdwR_uKBQ">

+      <requiredProfiles>j2ee</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java
index b1384f6e1d6..d57d257be7b 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AllTests.java
@@ -13,10 +13,10 @@
 
 package org.eclipse.papyrus.infra.gmfdiag.assistant.tests;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
 import org.junit.runners.Suite.SuiteClasses;
 
 /**
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
index a32806e8cfa..88e36d6256a 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
@@ -20,14 +20,14 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.core.IModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.DefaultModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.ModelingAssistantModelRegistry;
 import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.utils.JUnitUtils;
 import org.eclipse.uml2.uml.util.UMLUtil;
 import org.junit.rules.TestWatcher;
@@ -62,7 +62,7 @@ public class AssistantsFixture extends TestWatcher {
 		// Load the corresponding element types, if they are a custom set
 		URI elementTypesModelURI = getModelURI(assistantsModelPath.replaceFirst("\\.assistants$", ".elementtypesconfigurations"), description);
 		if (elementTypesModelURI != null) {
-			ElementTypeSetConfiguration elementTypes = UMLUtil.load(resourceSet, elementTypesModelURI, ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
+			ElementTypeSetConfiguration elementTypes = UMLUtil.load(resourceSet, elementTypesModelURI, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
 
 			try {
 				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) elementTypes);
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
index 8646b69811c..653969f63d4 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.infra.gmfdiag.assistant,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="5.1.0"
+ org.eclipse.uml2.uml;bundle-version="5.1.0",
+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0"
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,
  org.eclipse.papyrus.infra.gmfdiag.common.utils
 Bundle-Vendor: %providerName
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml
index 8ed905b33b7..0c39a506f83 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/fragment.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>

 <fragment>

    <extension

-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">

+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">

       <elementTypeSet

             clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"

             path="models/TestExpansionDiagram.elementtypesconfigurations">

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
index 9c3d8509c79..41dc1093548 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/models/TestExpansionDiagram.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="TestExpansionDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestExpansionDiagram" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">
-  <elementTypeConfigurations hint="Interface_Label" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" name="Interface" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="Interface_BorderItem" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" name="Interface" xmi:id="_C-1XION1EeSPY_4fjIBntw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_C-1XIeN1EeSPY_4fjIBntw"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations hint="Dependency_Link" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" name="Dependency" xmi:id="_Tm5Y0PPMEeSh3rAaWaQzhQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_Tm5Y0fPMEeSh3rAaWaQzhQ"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>
-  </elementTypeConfigurations>
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="TestExpansionDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestExpansionDiagram" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" xmi:version="2.0">

+  <elementTypeConfigurations hint="Interface_Label" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_Label" name="Interface" xmi:id="_rWNxVHPzEeSnGJwaJWHCSg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_rWNxVXPzEeSnGJwaJWHCSg"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="Interface_BorderItem" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Interface_BorderItem" name="Interface" xmi:id="_C-1XION1EeSPY_4fjIBntw" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_C-1XIeN1EeSPY_4fjIBntw"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Interface</specializedTypesID>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations hint="Dependency_Link" identifier="org.eclipse.papyrus.uml.diagram.testexpansion.Dependency_Link" name="Dependency" xmi:id="_Tm5Y0PPMEeSh3rAaWaQzhQ" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif" xmi:id="_Tm5Y0fPMEeSh3rAaWaQzhQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Dependency</specializedTypesID>

+  </elementTypeConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddLink.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddLink.java
index 800a55f5eed..235c7ba2d84 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddLink.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/src/org/eclipse/papyrus/infra/gmfdiag/common/tests/ExpansionAddLink.java
@@ -33,12 +33,12 @@ import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;

 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;

 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeConfigurationTypeRegistry;

 import org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor;

 import org.eclipse.papyrus.infra.gmfdiag.common.expansion.ChildrenListRepresentation;

 import org.eclipse.papyrus.infra.gmfdiag.common.expansion.DiagramExpansionSingleton;

 import org.eclipse.papyrus.infra.gmfdiag.common.expansion.DiagramExpansionsRegistry;

 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;

+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeConfigurationTypeRegistry;

 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.junit.utils.tests.AbstractEditorTest;

 import org.junit.Assert;

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.classpath b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.classpath
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.classpath
diff --git a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/.project b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.project
index 7fc0d886b2d..ba9a5dfdbe6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui/.project
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.infra.elementtypesconfigurations.emf.ui</name>
+	<name>org.eclipse.papyrus.infra.types.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -22,7 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.core.prefs
index eb9bfba9949..eb9bfba9949 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
index 8a9e090733b..3421a655037 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  org.junit;bundle-version="4.10.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0",

@@ -9,13 +10,13 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.tests

+Export-Package: org.eclipse.papyrus.infra.types.tests

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.elementtypesconfigurations.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.tests;singleton:=true

+Bundle-Activator: org.eclipse.papyrus.infra.types.tests.Activator

+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.tests;singleton:=true

 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/about.html b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/build.properties b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/build.properties
index 477c982e1d6..477c982e1d6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/build.properties
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/build.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/M.gif b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/M.gif
index f9a5b239d6c..f9a5b239d6c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/M.gif
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/M.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/O.gif b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/O.gif
index e6ce0916227..e6ce0916227 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/O.gif
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/O.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/Values.gif b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/Values.gif
index f1f019535ea..f1f019535ea 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/Values.gif
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/Values.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/debug.gif b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/debug.gif
index ac5431fa311..ac5431fa311 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/icons/debug.gif
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/icons/debug.gif
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.di b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/ElementTypesTestsProfile.profile.di
index bf9abab340f..bf9abab340f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.di
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/ElementTypesTestsProfile.profile.di
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.notation b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/ElementTypesTestsProfile.profile.notation
index 1d458586ccd..1d458586ccd 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.notation
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/ElementTypesTestsProfile.profile.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.uml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/ElementTypesTestsProfile.profile.uml
index 4f1610dae4d..4f1610dae4d 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/ElementTypesTestsProfile.profile.uml
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/ElementTypesTestsProfile.profile.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/MyPalette.palette b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/MyPalette.palette
index 6fe86de2535..6fe86de2535 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/MyPalette.palette
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/MyPalette.palette
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations
new file mode 100644
index 00000000000..f87090fa236
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.types.tests.cyclicAdvices.elementtypesconfigurations" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test cyclic edvices dependencies" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1" identifier="TestEditHelperAdvice1" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <after>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2</after>

+    <after>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3</after>

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2" identifier="TestEditHelperAdvice2" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <before>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1</before>

+    <after>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3</after>

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3" identifier="TestEditHelperAdvice3" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <before>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1</before>

+    <before>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2</before>

+    <after>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1</after>

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations
new file mode 100644
index 00000000000..903c3db5554
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/elementtypetest.elementtypesconfigurations
@@ -0,0 +1,108 @@
+<?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:invariantcontainerrule="http://www.eclipse.org/papyrus/emf/types/invariantcontainerrule/1.1" xmlns:invariantstereotyperule="http://www.eclipse.org/papyrus/uml/types/invariantstereotyperule/1.1" xmlns:rulebased="http://www.eclipse.org/papyrus/infra/types/rulebased/1.1" xmlns:setvaluesadvice="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.types.tests.tests" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test element types" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations description="" hint="ElementTypes" identifier="org.eclipse.papyrus.infra.types.tests.specificcomponent" name="Component in specific package only" xmi:id="_JIwuQLg9EeS0cu6lbJ9jDQ" xsi:type="rulebased:RuleBasedTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.ui" iconPath="icons/full/obj16/add_obj.gif" xmi:id="_FW5wwLg-EeS0cu6lbJ9jDQ"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>

+    <ruleConfiguration xmi:id="_N9YeYLg-EeS0cu6lbJ9jDQ" xsi:type="invariantcontainerrule:InvariantContainerRuleConfiguration">

+      <permissions containerType="org.eclipse.papyrus.uml.Package" xmi:id="_Ow-egLg-EeS0cu6lbJ9jDQ"/>

+      <permissions containerType="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" permitted="true" strict="true" xmi:id="_QsZCULg-EeS0cu6lbJ9jDQ"/>

+    </ruleConfiguration>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Package that can contain only components" hint="ElementTypes" identifier="org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly" name="PackageWithComponentsOnly" xmi:id="_Zn1TULg-EeS0cu6lbJ9jDQ" xsi:type="rulebased:RuleBasedTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>

+    <ruleConfiguration requiredProfile="" stereotypeQualifiedName="ElementTypesTestsProfile::PackageWithComponents" xmi:id="_mzVEQLg-EeS0cu6lbJ9jDQ" xsi:type="invariantstereotyperule:InvariantStereotypeRuleConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Semantic element type to create abstract classes" hint="Abstract Class Creation Action" identifier="org.eclipse.papyrus.infra.types.tests.aspectabstractclass" name="Abstract Class Creation Action" xmi:id="_mhW74My1EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_qI4JwNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype" name="Class With Stereotype" xmi:id="_CSBmcMy2EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8kqIkNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename" name="Package With Stereotype And Renamed" xmi:id="_5vXW8My3EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8yABANLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues" name="Package With Stereotype And Renamed" xmi:id="_HT1okMy4EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_8-EHENLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype" name="Package With Stereotype And Renamed" xmi:id="_mrg2EMy4EeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.infra.types.tests.aspectabstractclass</specializedTypesID>

+    <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_9KgAkNLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations description="Aspect Semantic element type to create abstract classes" identifier="org.eclipse.papyrus.infra.types.tests.aspectabstractclass.advice" target="_mhW74My1EeS2aYvfnAB4ZA" xmi:id="_6Zq8QLg_EeS0cu6lbJ9jDQ" xsi:type="setvaluesadvice:SetValuesAdviceConfiguration">

+    <featuresToSet featureName="isAbstract" xmi:id="_7FIUELg_EeS0cu6lbJ9jDQ">

+      <value xmi:id="_-d4_oLg_EeS0cu6lbJ9jDQ" xsi:type="setvaluesadvice:ConstantValue">

+        <valueInstance value="true" xmi:id="__mUnULg_EeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>

+      </value>

+    </featuresToSet>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotype.advice" target="_CSBmcMy2EeS2aYvfnAB4ZA" xmi:id="_NEmxYLhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" xmi:id="_PuEG8LhAEeS0cu6lbJ9jDQ">

+      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeRename.advice" target="_5vXW8My3EeS2aYvfnAB4ZA" xmi:id="_Z3bfkMy4EeS2aYvfnAB4ZA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true" xmi:id="_Z3bfkcy4EeS2aYvfnAB4ZA">

+      <requiredProfiles>ElementTypesTestProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.types.tests.classSimpleStereotypeSetValues.advice" target="_HT1okMy4EeS2aYvfnAB4ZA" xmi:id="_havkELhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeaturesToSet" updateName="true" xmi:id="_vA53wLhAEeS0cu6lbJ9jDQ">

+      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>

+      <featuresToSet featureName="stringFeature" xmi:id="__E3qoLhAEeS0cu6lbJ9jDQ">

+        <value xmi:id="_DFSzILhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance value="MyStringValue" xmi:id="_MDKGALhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralString"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="value" xmi:id="_A8odgLhBEeS0cu6lbJ9jDQ">

+        <value xmi:id="_Eb_gULhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance value="3" xmi:id="_Gt4qcLhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralInteger"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="boolean" xmi:id="_BSTykLhBEeS0cu6lbJ9jDQ">

+        <value xmi:id="_ExAHALhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance value="true" xmi:id="_QFRQkLhBEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="enumeration" xmi:id="_Bm_pILhBEeS0cu6lbJ9jDQ">

+        <value xmi:id="_FFqIYLhBEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance xmi:id="_VToy4LhBEeS0cu6lbJ9jDQ" xsi:type="uml:InstanceValue">

+            <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>

+          </valueInstance>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="multiStrings" xmi:id="_B7jj4LhBEeS0cu6lbJ9jDQ">

+        <value xmi:id="_rQRXYLhDEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ListValue"/>

+      </featuresToSet>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.types.tests.abstractclassSimpleStereotype.advice" target="_mrg2EMy4EeS2aYvfnAB4ZA" xmi:id="_ls9AILhAEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="ElementTypesTestsProfile::StereotypeWithFeatureToSet" xmi:id="_u0-NMLhDEeS0cu6lbJ9jDQ">

+      <requiredProfiles>ElementTypesTestsProfile</requiredProfiles>

+      <featuresToSet featureName="stringFeature" xmi:id="_6XspgLhDEeS0cu6lbJ9jDQ">

+        <value xmi:id="_7YVAELhDEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance name="" value="MyOtherValue" xmi:id="_-BmvcLhDEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralString"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="value" xmi:id="_Bj7msLhEEeS0cu6lbJ9jDQ">

+        <value xmi:id="_Dd4x8LhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance value="18" xmi:id="_HdrBQLhEEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralInteger"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="boolean" xmi:id="_CKkv8LhEEeS0cu6lbJ9jDQ">

+        <value xmi:id="_It5TALhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance value="true" xmi:id="_JxtgcLhEEeS0cu6lbJ9jDQ" xsi:type="uml:LiteralBoolean"/>

+        </value>

+      </featuresToSet>

+      <featuresToSet featureName="enumeration" xmi:id="_CqCTILhEEeS0cu6lbJ9jDQ">

+        <value xmi:id="_LYi7YLhEEeS0cu6lbJ9jDQ" xsi:type="applystereotypeadvice:ConstantValue">

+          <valueInstance name="" xmi:id="_NPf18LhEEeS0cu6lbJ9jDQ" xsi:type="uml:InstanceValue">

+            <instance href="ElementTypesTestsProfile.profile.uml#_T4hRALhHEeS0cu6lbJ9jDQ"/>

+          </valueInstance>

+        </value>

+      </featuresToSet>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.di b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/model.di
index bf9abab340f..bf9abab340f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.di
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/model.di
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.notation b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/model.notation
index 71ff069b40f..71ff069b40f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.notation
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/model.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.uml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/model.uml
index 020393cf651..020393cf651 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/model.uml
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/model.uml
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations
new file mode 100644
index 00000000000..0a40140a8d6
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.types.tests.validAdvices.elementtypesconfigurations" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test cyclic edvices dependencies" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1" identifier="TestEditHelperAdvice1" xmi:id="_SGAo4LK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <before>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2</before>

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2" identifier="TestEditHelperAdvice2" xmi:id="_nSyIoLK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <before>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3</before>

+    <after>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1</after>

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+  <adviceBindingsConfigurations editHelperAdviceClassName="org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3" identifier="TestEditHelperAdvice3" xmi:id="_ojuzILK-EeWUIbTgfwAP3g" xsi:type="elementtypesconfigurations:AdviceBindingConfiguration">

+    <after>org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2</after>

+    <target href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sca0wVYCEeS0WsAAtVmToA" xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration"/>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/org.eclipse.papyrus.infra.elementtypes.tests.launch b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/org.eclipse.papyrus.infra.types.tests.launch
index 5e34eeef8ce..21e01810665 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/org.eclipse.papyrus.infra.elementtypes.tests.launch
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/org.eclipse.papyrus.infra.types.tests.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java"/>
+<listEntry value="/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AllTests.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -25,9 +25,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.types.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.elementtypesconfigurations.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.types.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
 <stringAttribute key="pde.version" value="3.3"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.properties b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/plugin.properties
index 596019605b9..596019605b9 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.properties
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/plugin.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/plugin.xml
index 604ae6cf4da..f53483d7e6f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/plugin.xml
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
       	    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="model/elementtypetest.elementtypesconfigurations">
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/pom.xml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/pom.xml
index c7c5937e5ab..6e1b56322a5 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/pom.xml
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/pom.xml
@@ -6,10 +6,10 @@
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus.tests.releng</artifactId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../../../../../releng/main-tests</relativePath>
+    <relativePath>../../../../../../releng/main-tests</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.tests</artifactId>
+  <artifactId>org.eclipse.papyrus.infra.types.tests</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AbstractElementTypeTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AbstractElementTypeTests.java
index db22a640ce1..f33892a1024 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AbstractElementTypeTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AbstractElementTypeTests.java
@@ -11,7 +11,7 @@
  *  Christian W. Damus - bug 485220
  *  
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+package org.eclipse.papyrus.infra.types.tests;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -97,7 +97,7 @@ public abstract class AbstractElementTypeTests extends AbstractPapyrusTest imple
 
 		// import test model and profile
 		try {
-			Bundle bundle = Platform.getBundle("org.eclipse.papyrus.infra.elementtypesconfigurations.tests");
+			Bundle bundle = Platform.getBundle("org.eclipse.papyrus.infra.types.tests");
 			copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, "/model/", "model");
 			PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, "/model/", "ElementTypesTestsProfile.profile");
 		} catch (CoreException e) {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/Activator.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/Activator.java
index 685ab64c3cc..8fc86220b59 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/Activator.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  CEA LIST - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+package org.eclipse.papyrus.infra.types.tests;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -20,11 +20,11 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.types.tests"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
-	
+
 	/**
 	 * The constructor
 	 */
@@ -33,6 +33,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext context) throws Exception {
@@ -42,6 +43,7 @@ public class Activator extends AbstractUIPlugin {
 
 	/*
 	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop(BundleContext context) throws Exception {
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AllTests.java
index 08d72bea472..b532518c089 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/AllTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AllTests.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+package org.eclipse.papyrus.infra.types.tests;
 
 import org.junit.runner.RunWith;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementEditHelperAdviceTests.java
index 17ec1f21322..6f910601feb 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementEditHelperAdviceTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementEditHelperAdviceTests.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

  *****************************************************************************/

-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+package org.eclipse.papyrus.infra.types.tests;

 

 import java.util.ArrayList;

 import java.util.Arrays;

@@ -33,12 +33,12 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;

-import org.eclipse.papyrus.infra.elementtypesconfigurations.utils.AdviceComparator;

 import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

+import org.eclipse.papyrus.infra.types.core.utils.AdviceComparator;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.Package;

 import org.junit.Assert;

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementTypesRegistryTests.java
index 6c0f7d518dc..d5ca6eb5d05 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ElementTypesRegistryTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementTypesRegistryTests.java
@@ -13,15 +13,16 @@
  *  Christian W. Damus - bug 485220
  *  
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+package org.eclipse.papyrus.infra.types.tests;
 
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * Tests for {@link ElementTypesConfigurationsRegistry}
+ * Tests for {@link ElementTypeSetConfigurationRegistry}
  */
 public class ElementTypesRegistryTests extends AbstractElementTypeTests implements ITestConstants {
 
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ITestConstants.java
index 449ab399284..8ef9da8f4cc 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/ITestConstants.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ITestConstants.java
@@ -9,7 +9,7 @@
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
+package org.eclipse.papyrus.infra.types.tests;
 
 
 /**
@@ -18,13 +18,13 @@ package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;
 public interface ITestConstants {
 	static final String ORG_ECLIPSE_PAPYRUS_UML_CLASS = "org.eclipse.papyrus.uml.Class"; //$NON-NLS-1$
 
-	final static String ABSTRACT_CLASS_TOOL = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.aspectabstractclass"; //$NON-NLS-1$
+	final static String ABSTRACT_CLASS_TOOL = "org.eclipse.papyrus.infra.types.tests.aspectabstractclass"; //$NON-NLS-1$
 
-	final static String ElementTypeConfigurationSetName_Test1 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests"; //$NON-NLS-1$
+	final static String ElementTypeConfigurationSetName_Test1 = "org.eclipse.papyrus.infra.types.tests.tests"; //$NON-NLS-1$
 
-	final static String WORKSPACE_ELEMENT_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype"; //$NON-NLS-1$
+	final static String WORKSPACE_ELEMENT_TYPE_ID = "org.eclipse.papyrus.infra.types.tests.workspacetype"; //$NON-NLS-1$
 
-	final static String WORKSPACE_ELEMENT_TYPE_TOOL = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool"; //$NON-NLS-1$
+	final static String WORKSPACE_ELEMENT_TYPE_TOOL = "org.eclipse.papyrus.infra.types.tests.tool"; //$NON-NLS-1$
 
 	static final String PACKAGE_WITH_COMPONENTS = "PackageWithComponents"; //$NON-NLS-1$
 
@@ -32,19 +32,19 @@ public interface ITestConstants {
 
 	static final String OTHER_PACKAGE_WITH_COMPONENTS = "OtherPackageWithComponents"; //$NON-NLS-1$
 
-	static final String PACKAGE_WITH_COMPONENTS_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.packagewithcomponentsonly"; //$NON-NLS-1$
+	static final String PACKAGE_WITH_COMPONENTS_TYPE_ID = "org.eclipse.papyrus.infra.types.tests.packagewithcomponentsonly"; //$NON-NLS-1$
 
-	static final String SPECIFICCOMPONENT_TYPE_ID = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.specificcomponent"; //$NON-NLS-1$
+	static final String SPECIFICCOMPONENT_TYPE_ID = "org.eclipse.papyrus.infra.types.tests.specificcomponent"; //$NON-NLS-1$
 
 	static final String COMPONENT_NAME = "Component1"; //$NON-NLS-1$
 
-	static final String CYCLIC_ADVICES_CONFIGURATIONS = "platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/cyclicAdvices.elementtypesconfigurations";
+	static final String CYCLIC_ADVICES_CONFIGURATIONS = "platform:/plugin/org.eclipse.papyrus.infra.types.tests/model/cyclicAdvices.elementtypesconfigurations";
 
-	static final String VALID_ADVICES_ORDER_CONFIGURATIONS = "platform:/plugin/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/model/validAdvicesOrder.elementtypesconfigurations";
+	static final String VALID_ADVICES_ORDER_CONFIGURATIONS = "platform:/plugin/org.eclipse.papyrus.infra.types.tests/model/validAdvicesOrder.elementtypesconfigurations";
 
-	static final String ADVICES_ID_1 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice1";
-	static final String ADVICES_ID_2 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice2";
-	static final String ADVICES_ID_3 = "org.eclipse.papyrus.infra.elementtypesconfigurations.tests.TestEditHelperAdvice3";
+	static final String ADVICES_ID_1 = "org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice1";
+	static final String ADVICES_ID_2 = "org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice2";
+	static final String ADVICES_ID_3 = "org.eclipse.papyrus.infra.types.tests.TestEditHelperAdvice3";
 
 
 }
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice1.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice1.java
index 1b9f3e552ab..76d0db027aa 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice1.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice1.java
@@ -11,7 +11,7 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+package org.eclipse.papyrus.infra.types.tests;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice2.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice2.java
index a4472a6125d..eabffd14ef8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice2.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice2.java
@@ -11,7 +11,7 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+package org.eclipse.papyrus.infra.types.tests;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice3.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice3.java
index cfa4994160d..c0bd8596c23 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/tests/TestEditHelperAdvice3.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/TestEditHelperAdvice3.java
@@ -11,7 +11,7 @@
  *   

  *****************************************************************************/

 

-package org.eclipse.papyrus.infra.elementtypesconfigurations.tests;

+package org.eclipse.papyrus.infra.types.tests;

 

 import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;

 

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.classpath b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.classpath
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.classpath
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.project b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.project
new file mode 100644
index 00000000000..4b28f07d54e
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.infra.types.ui.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.core.prefs
index eb9bfba9949..eb9bfba9949 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
index c6ed73d54d2..f9da5fb49f8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/META-INF/MANIFEST.MF
@@ -3,19 +3,19 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit,
  org.eclipse.gmf.runtime.emf.type.core,
  org.eclipse.papyrus.infra.core
-Export-Package: org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests
+Export-Package: org.eclipse.papyrus.infra.types.ui.tests
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.ui.tests;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/about.html b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.elementtypesconfigurations/about.html
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/build.properties b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/build.properties
index dbbbb2abde7..dbbbb2abde7 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/build.properties
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/build.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ElementTypesMenu.xmi b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ElementTypesMenu.xmi
index 8b806ee99e6..8b806ee99e6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ElementTypesMenu.xmi
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ElementTypesMenu.xmi
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ElementTypesTestsProfile.ctx b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ElementTypesTestsProfile.ctx
index 53530aadcbb..53530aadcbb 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/ElementTypesTestsProfile.ctx
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ElementTypesTestsProfile.ctx
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/MyPalette.palette b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/MyPalette.palette
index 6fe86de2535..6fe86de2535 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/model/MyPalette.palette
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/MyPalette.palette
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations
new file mode 100644
index 00000000000..8ee9c548799
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/WorkspaceTest.elementtypesconfigurations
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:setvaluesadvice="http://www.eclipse.org/papyrus/emf/types/setvaluesadvice/1.1" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.workspacetype" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="WorkspaceTypeTests" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations hint="WorkspaceType_AbstractClass" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" name="WorkspaceType_AbstractClass" xmi:id="_Sg8B4MyyEeS2aYvfnAB4ZA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tool" target="_Sg8B4MyyEeS2aYvfnAB4ZA" xmi:id="_1JyvELtVEeSfJNL-2_VlLg" xsi:type="setvaluesadvice:SetValuesAdviceConfiguration">

+    <featuresToSet featureName="isAbstract" xmi:id="_CNnKsLtWEeSfJNL-2_VlLg">

+      <value xmi:id="_E2SdILtWEeSfJNL-2_VlLg" xsi:type="setvaluesadvice:ConstantValue">

+        <valueInstance value="true" xmi:id="_FySLULtWEeSfJNL-2_VlLg" xsi:type="uml:LiteralBoolean"/>

+      </value>

+    </featuresToSet>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations
new file mode 100644
index 00000000000..50bbb08ba4e
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/elementtypetestui.elementtypesconfigurations
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:runtimevaluesadvice="http://www.eclipse.org/papyrus/emf/types/runtimevaluesadvice/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.tests.ui" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="Test element types UI" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" xmi:version="2.0">

+  <elementTypeConfigurations description="Test elementTypeConfigurations" hint="ElementElementTypeConfigurations" identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView" name="Package With Stereotype And Renamed - View" xmi:id="_SKcvUMzEEeSJ0sn3znt87w" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <specializedTypesID>org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRename</specializedTypesID>

+    <matcherConfiguration matcherClassName="org.eclipse.gmf.runtime.emf.type.core.NullElementMatcher" xmi:id="_9WxiANLXEeSAkKOodzTEYg" xsi:type="elementtypesconfigurations:MatcherConfiguration"/>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.infra.elementtypesconfigurations.tests.classSimpleStereotypeRenameWithView.advice" target="_SKcvUMzEEeSJ0sn3znt87w" xmi:id="_bmwRsMzEEeSJ0sn3znt87w" xsi:type="runtimevaluesadvice:RuntimeValuesAdviceConfiguration">

+    <viewsToDisplay xmi:id="_d7FEwMzEEeSJ0sn3znt87w">

+      <view href="ElementTypesTestsProfile.ctx#__31rg8pnEeWJM5S7C-EqVg"/>

+    </viewsToDisplay>

+  </adviceBindingsConfigurations>

+</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
new file mode 100644
index 00000000000..deea76ec25f
--- /dev/null
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/model/ui/SingleStereotypeWithFeaturesToSet.xwt
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Composite xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"
+	xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"
+	xmlns:j="clr-namespace:java.lang">
+	<Composite.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:stringFeature"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:boolean"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:value"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:enumeration"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="ElementTypesTestsProfile:StereotypeWithFeaturesToSet:multiStrings"></ppe:MultiString>
+	</Composite>
+</Composite>
\ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/org.eclipse.papyrus.infra.elementtypes.tests.ui.launch b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
index efed3030387..3d903a6efa1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/org.eclipse.papyrus.infra.elementtypes.tests.ui.launch
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/org.eclipse.papyrus.infra.types.ui.tests.launch
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspacemd5"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.types.ui.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.types.ui.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="false"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/plugin.properties b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/plugin.properties
index 596019605b9..596019605b9 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/plugin.properties
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/plugin.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/plugin.xml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/plugin.xml
index fd912e73f31..ab22b6f908a 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/plugin.xml
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/plugin.xml
@@ -8,7 +8,7 @@
       </menuCreationModel>
    </extension>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
       	    clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="model/elementtypetestui.elementtypesconfigurations">
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/pom.xml b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/pom.xml
index 6f55d725c2c..0e8da87fe00 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/pom.xml
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/pom.xml
@@ -6,10 +6,10 @@
     <groupId>org.eclipse.papyrus</groupId>
     <artifactId>org.eclipse.papyrus.tests.releng</artifactId>
     <version>1.2.0-SNAPSHOT</version>
-    <relativePath>../../../../../releng/main-tests</relativePath>
+    <relativePath>../../../../../../releng/main-tests</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests</artifactId>
+  <artifactId>org.eclipse.papyrus.infra.types.ui.tests</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/AllTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java
index ea019a4f63d..40333205ea6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/AllTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/AllTests.java
@@ -11,9 +11,9 @@
  *  Christian W. Damus - bug 485220
  *  
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests;
+package org.eclipse.papyrus.infra.types.ui.tests;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.tests.ElementTypesRegistryTests;
+import org.eclipse.papyrus.infra.types.tests.ElementTypesRegistryTests;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite.SuiteClasses;
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/ElementTypesRegistryTests.java
index 135f2ecc549..44389ddab78 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/src/org/eclipse/papyrus/infra/elementtypesconfigurations/ui/tests/ElementTypesRegistryTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/ElementTypesRegistryTests.java
@@ -13,7 +13,7 @@
  *  Christian W. Damus - bug 485220
  *  
  *****************************************************************************/
-package org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests;
+package org.eclipse.papyrus.infra.types.ui.tests;
 
 import static org.junit.Assert.fail;
 
@@ -24,10 +24,10 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.tests.AbstractElementTypeTests;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.tests.ITestConstants;
 import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.tests.AbstractElementTypeTests;
+import org.eclipse.papyrus.infra.types.tests.ITestConstants;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -36,7 +36,7 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 
 /**
- * Tests for {@link ElementTypesConfigurationsRegistry}
+ * Tests for {@link ElementTypeSetConfigurationRegistry}
  */
 public class ElementTypesRegistryTests extends AbstractElementTypeTests implements ITestConstants {
 
@@ -50,7 +50,7 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
 		// import user-defined element types model
 		try {
 			Bundle bundle = FrameworkUtil.getBundle(ElementTypesRegistryTests.class);
-			workspaceTestFile = PapyrusProjectUtils.copyIFile("/model/WorkspaceTest.elementtypesconfigurations", bundle, createProject, "/model/WorkspaceTest.elementtypesconfigurations");
+			workspaceTestFile = PapyrusProjectUtils.copyIFile("/model/WorkspaceTest.typesconfigurations", bundle, createProject, "/model/WorkspaceTest.typesconfigurations");
 			Assert.assertTrue(workspaceTestFile.isAccessible());
 		} catch (CoreException e) {
 			fail(e.getMessage());
diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF
index e0f37842509..6b1e3a8d35a 100644
--- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.filters.tests;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.filters.tests;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.gmfdiag.assistant.tests;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0",

  org.eclipse.papyrus.uml.profile.assistants.generator.tests;bundle-version="1.2.0"

 Export-Package: org.eclipse.papyrus.tests.diagramassistants

 Bundle-Vendor: %providerName

diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch
index d3d9b3eb4e0..8bf0f4d60a0 100644
--- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch
+++ b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/Papyrus Diagram Assistants tests.launch
@@ -12,7 +12,7 @@
 <listEntry value="=org.eclipse.papyrus.uml.profile.assistants.generator/src"/>
 <listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant.edit/src-gen"/>
 <listEntry value="=org.eclipse.papyrus.uml.filters.edit/src-gen"/>
-<listEntry value="=org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/src"/>
+<listEntry value="=org.eclipse.papyrus.uml.profile.types.generator/src"/>
 <listEntry value="=org.eclipse.papyrus.uml.profile.assistants.generator/xtend-gen"/>
 <listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant.ui/src"/>
 <listEntry value="=org.eclipse.papyrus.uml.filters/src"/>
@@ -21,7 +21,7 @@
 <listEntry value="=org.eclipse.papyrus.uml.profile.assistants.generator.ui/src"/>
 <listEntry value="=org.eclipse.papyrus.infra.filters/src-gen"/>
 <listEntry value="=org.eclipse.papyrus.uml.filters/src-gen"/>
-<listEntry value="=org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator/xtend-gen"/>
+<listEntry value="=org.eclipse.papyrus.uml.profile.types.generator/xtend-gen"/>
 <listEntry value="=org.eclipse.papyrus.infra.gmfdiag.assistant/src-gen"/>
 <listEntry value="=org.eclipse.papyrus.infra.filters.edit/src-gen"/>
 </listAttribute>
diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java
index 8bd6072a60d..9ca38bb8ff8 100644
--- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java
+++ b/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/src/org/eclipse/papyrus/tests/diagramassistants/AllTests.java
@@ -45,7 +45,7 @@ public class AllTests {
 		// UML layer
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.filters.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.assistants.generator.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.types.generator.tests.AllTests.class));
 	}
 
 	public static void appendTo(Collection<? super ITestSuiteClass> suite) {
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
index c34fb6f36eb..3142eb61b4b 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
@@ -1,5 +1,6 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

+ org.eclipse.papyrus.infra.types.core;bundle-version="1.2.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"

 Export-Package: org.eclipse.papyrus.sysml.service.types.tests.suites

 Bundle-Vendor: %providerName

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
index 855fc82e83e..3723ecabe22 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
@@ -10,9 +10,9 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;
 import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
@@ -51,11 +51,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML ModelElements sub-profile contents
 		Iterator<EObject> it = ModelelementsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -66,11 +66,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML ModelElements sub-profile contents
 		Iterator<EObject> it = ModelelementsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -81,37 +81,37 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Blocks sub-profile contents
 		Iterator<EObject> it = BlocksPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
-				EClass eClass = (EClass)eObject;
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
 
-				if("DistributedProperty".equals(eClass.getName())) {
+				if ("DistributedProperty".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("NestedConnectorEnd".equals(eClass.getName())) {
+				if ("NestedConnectorEnd".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("ParticipantProperty".equals(eClass.getName())) {
+				if ("ParticipantProperty".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("ConnectorProperty".equals(eClass.getName())) {
+				if ("ConnectorProperty".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("BindingConnector".equals(eClass.getName())) {
+				if ("BindingConnector".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("PropertySpecificType".equals(eClass.getName())) {
+				if ("PropertySpecificType".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
@@ -126,10 +126,10 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Blocks sub-profile contents
 		Iterator<EObject> it = BlocksPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
-				EClass eClass = (EClass)eObject;
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
 
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
@@ -141,11 +141,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Constraints sub-profile contents
 		Iterator<EObject> it = ConstraintsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -156,11 +156,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Constraints sub-profile contents
 		Iterator<EObject> it = ConstraintsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -171,11 +171,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Activities sub-profile contents
 		Iterator<EObject> it = ActivitiesPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -186,17 +186,17 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Requirements sub-profile contents
 		Iterator<EObject> it = RequirementsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
-				EClass eClass = (EClass)eObject;
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
 
-				if("TestCase".equals(eClass.getName())) {
+				if ("TestCase".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("RequirementRelated".equals(eClass.getName())) {
+				if ("RequirementRelated".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
@@ -211,10 +211,10 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Requirements sub-profile contents
 		Iterator<EObject> it = RequirementsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
-				EClass eClass = (EClass)eObject;
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
 
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
@@ -226,17 +226,17 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Allocations sub-profile contents
 		Iterator<EObject> it = AllocationsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
-				EClass eClass = (EClass)eObject;
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
 
-				if("Allocated".equals(eClass.getName())) {
+				if ("Allocated".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
 
-				if("AllocateActivityPartition".equals(eClass.getName())) {
+				if ("AllocateActivityPartition".equals(eClass.getName())) {
 					// Not implemented
 					continue;
 				}
@@ -251,10 +251,10 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML Allocations sub-profile contents
 		Iterator<EObject> it = AllocationsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
-				EClass eClass = (EClass)eObject;
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
 
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
@@ -266,11 +266,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML PortAndFlows sub-profile contents
 		Iterator<EObject> it = PortandflowsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -281,11 +281,11 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 
 		// Iterate over SysML PortAndFlows sub-profile contents
 		Iterator<EObject> it = PortandflowsPackage.eINSTANCE.eAllContents();
-		while(it.hasNext()) {
+		while (it.hasNext()) {
 			EObject eObject = it.next();
-			if(eObject instanceof EClass) {
+			if (eObject instanceof EClass) {
 
-				EClass eClass = (EClass)eObject;
+				EClass eClass = (EClass) eObject;
 				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
@@ -295,7 +295,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 	public void testRegistryContentForSysMLAssociations() {
 
 		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);
-		if(context == null) {
+		if (context == null) {
 			fail("Papyrus IClientContext could not be found.");
 		}
 
@@ -327,13 +327,13 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 		assertTrue("Incorrect kind of ElementType (ISpecializationType expected for " + SysMLElementTypes.ASSOCIATION_SHARED.getId() + ")", SysMLElementTypes.ASSOCIATION_SHARED instanceof ISpecializationType);
 		assertTrue("Incorrect kind of ElementType (ISpecializationType expected for " + SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED.getId() + ")", SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED instanceof ISpecializationType);
 
-		ISpecializationType association = (ISpecializationType)SysMLElementTypes.ASSOCIATION;
-		ISpecializationType associationComposite = (ISpecializationType)SysMLElementTypes.ASSOCIATION_COMPOSITE;
-		ISpecializationType associationCompositeDirected = (ISpecializationType)SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
-		ISpecializationType associationNone = (ISpecializationType)SysMLElementTypes.ASSOCIATION_NONE;
-		ISpecializationType associationNoneDirected = (ISpecializationType)SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
-		ISpecializationType associationShared = (ISpecializationType)SysMLElementTypes.ASSOCIATION_SHARED;
-		ISpecializationType associationSharedDirected = (ISpecializationType)SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
+		ISpecializationType association = (ISpecializationType) SysMLElementTypes.ASSOCIATION;
+		ISpecializationType associationComposite = (ISpecializationType) SysMLElementTypes.ASSOCIATION_COMPOSITE;
+		ISpecializationType associationCompositeDirected = (ISpecializationType) SysMLElementTypes.ASSOCIATION_COMPOSITE_DIRECTED;
+		ISpecializationType associationNone = (ISpecializationType) SysMLElementTypes.ASSOCIATION_NONE;
+		ISpecializationType associationNoneDirected = (ISpecializationType) SysMLElementTypes.ASSOCIATION_NONE_DIRECTED;
+		ISpecializationType associationShared = (ISpecializationType) SysMLElementTypes.ASSOCIATION_SHARED;
+		ISpecializationType associationSharedDirected = (ISpecializationType) SysMLElementTypes.ASSOCIATION_SHARED_DIRECTED;
 
 		assertTrue("Incorrect specialization type hierarchy for " + SysMLElementTypes.ASSOCIATION.getId(), association.isSpecializationOf(UMLElementTypes.ASSOCIATION_BASE));
 		assertTrue("Incorrect specialization type hierarchy for " + SysMLElementTypes.ASSOCIATION_COMPOSITE.getId(), associationComposite.isSpecializationOf(association));
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
index 39dd8048097..9f402b3321d 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
@@ -5,18 +5,18 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
  org.eclipse.emf.ecore;bundle-version="2.11.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.1.0",
  org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
  com.google.inject;bundle-version="3.0.0",
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
- org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0"
 Export-Package: org.eclipse.papyrus.uml.profile.assistants.generator.tests
 Bundle-Vendor: %providerName
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/org.eclipse.papyrus.uml.profile.assistants.generator.tests.launch b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/org.eclipse.papyrus.uml.profile.assistants.generator.tests.launch
deleted file mode 100644
index 5ec60cd22ad..00000000000
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/org.eclipse.papyrus.uml.profile.assistants.generator.tests.launch
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
-<listEntry value="=org.eclipse.papyrus.uml.decoratormodel/src"/>
-</listAttribute>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms128m -Xmx1200m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java
index 976d83fc85e..a40cb5933de 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/DiagramSpecificAssistantsGenerationTest.java
@@ -33,7 +33,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.ElementTypeFilter;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.BaseElementTypes;
+import org.eclipse.papyrus.uml.profile.types.generator.tests.BaseElementTypes;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.xtext.xbase.lib.Pair;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java
index 48c459414cd..96dba9a6eee 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/src/org/eclipse/papyrus/uml/profile/assistants/generator/tests/ModelGenFixture.java
@@ -35,7 +35,7 @@ import org.eclipse.papyrus.infra.gmfdiag.assistant.ModelingAssistantProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.PopupAssistant;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.util.AssistantResource;
 import org.eclipse.papyrus.uml.profile.assistants.generator.ModelingAssistantsGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.xtext.xbase.lib.Pair;
@@ -46,7 +46,7 @@ import com.google.common.collect.Lists;
 /**
  * A specialization of the element types generation fixture that additionally generates the Diagram Assistants model.
  */
-public class ModelGenFixture extends org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.ModelGenFixture {
+public class ModelGenFixture extends org.eclipse.papyrus.uml.profile.types.generator.tests.ModelGenFixture {
 	public ModelGenFixture() {
 		super();
 	}
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.project b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.project
deleted file mode 100644
index 99c0099f8e6..00000000000
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.classpath b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.classpath
index 098194ca4b7..098194ca4b7 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.classpath
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.classpath
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.project b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.project
new file mode 100644
index 00000000000..90676cebade
--- /dev/null
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.uml.profile.types.generator.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..f08be2b06c4 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..42646bfadd3
--- /dev/null
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0

+Require-Bundle: org.eclipse.core.runtime,

+ org.junit;bundle-version="4.11.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",

+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",

+ org.eclipse.emf.ecore;bundle-version="2.11.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0",

+ org.eclipse.uml2.uml;bundle-version="5.1.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",

+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",

+ org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",

+ com.google.inject;bundle-version="3.0.0",

+ com.google.guava;bundle-version="11.0.0",

+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.0"

+Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests

+Bundle-Vendor: %providerName

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Version: 1.2.0.qualifier

+Bundle-Localization: plugin

+Bundle-Name: %pluginName

+Bundle-ManifestVersion: 2

+Bundle-Description: %pluginDescription

+Bundle-SymbolicName: org.eclipse.papyrus.uml.profile.types.generator.tests;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/about.html b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/about.html
index d35d5aed64c..d35d5aed64c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.elementtypesconfigurations.ui.tests/about.html
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/about.html
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/build.properties b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/build.properties
index e6ac66d4daf..e6ac66d4daf 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/build.properties
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/build.properties
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.launch b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/org.eclipse.papyrus.uml.profile.types.generator.tests.launch
index 5ec60cd22ad..10eca5b82fe 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.launch
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/org.eclipse.papyrus.uml.profile.types.generator.tests.launch
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
-<listEntry value="=org.eclipse.papyrus.uml.decoratormodel/src"/>
-</listAttribute>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms128m -Xmx1200m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

+<listEntry value="=org.eclipse.papyrus.uml.decoratormodel/src"/>

+</listAttribute>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.profile.types.generator.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.profile.types.generator.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms128m -Xmx1200m -XX:PermSize=256M -XX:MaxPermSize=512M"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/plugin.properties b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/plugin.properties
index 0e75fec33b0..0e75fec33b0 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/plugin.properties
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/plugin.properties
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/pom.xml b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/pom.xml
index fab3f51e486..fe5559dade5 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/pom.xml
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/pom.xml
@@ -7,7 +7,7 @@
 		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../../../../../releng/main-tests</relativePath>
 	</parent>
-	<artifactId>org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests</artifactId>
+	<artifactId>org.eclipse.papyrus.uml.profile.types.generator.tests</artifactId>
 	<groupId>org.eclipse.papyrus</groupId>
 	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/j2ee.profile.di b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.di
index 24bc988cd5f..24bc988cd5f 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/j2ee.profile.di
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.di
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/j2ee.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.notation
index 3b5f2260540..3b5f2260540 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/j2ee.profile.notation
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.notation
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/j2ee.profile.uml b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.uml
index e63302b1f11..e63302b1f11 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/j2ee.profile.uml
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/j2ee.profile.uml
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/nesting.profile.di b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.di
index bf9abab340f..bf9abab340f 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/nesting.profile.di
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.di
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/nesting.profile.notation b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.notation
index febce5398f0..febce5398f0 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/nesting.profile.notation
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.notation
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/nesting.profile.uml b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.uml
index 7cd07408209..7cd07408209 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/resources/nesting.profile.uml
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/resources/nesting.profile.uml
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/AllTests.java
index 98ebd5980b1..d792480bba0 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/AllTests.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/AllTests.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import org.junit.runner.RunWith;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/BaseElementTypes.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/BaseElementTypes.java
index cb36f5b6f7c..491af910aaa 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/BaseElementTypes.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/BaseElementTypes.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/BasicElementTypesGenerationTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/BasicElementTypesGenerationTest.java
index 8d7c6a4de9e..ff95df9d1ab 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/BasicElementTypesGenerationTest.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/BasicElementTypesGenerationTest.java
@@ -11,7 +11,7 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.isEmpty;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -22,13 +22,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.IconEntry;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.UMLPackage;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java
index f0ee138045e..6f1d6c1bc2e 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationBug461717Test.java
@@ -11,11 +11,11 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.isEmpty;
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.regexContains;
-import static org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.GenOption.SUPPRESS_SEMANTIC_SUPERTYPE;
+import static org.eclipse.papyrus.uml.profile.types.generator.tests.GenOption.SUPPRESS_SEMANTIC_SUPERTYPE;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
@@ -24,11 +24,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.xtext.xbase.lib.Pair;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/DiagramSpecificElementTypesGenerationTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationTest.java
index d6ea3489e99..5abfb7028de 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/DiagramSpecificElementTypesGenerationTest.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/DiagramSpecificElementTypesGenerationTest.java
@@ -11,7 +11,7 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import static com.google.common.collect.Iterables.transform;
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.isEmpty;
@@ -26,10 +26,10 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementtypesconfigurationsPackage;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
 import org.eclipse.papyrus.infra.emf.utils.EMFFunctions;
+import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
+import org.eclipse.papyrus.infra.types.IconEntry;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.eclipse.uml2.uml.Class;
@@ -91,7 +91,7 @@ public class DiagramSpecificElementTypesGenerationTest extends AbstractPapyrusTe
 	public void distinctHintsGenerated() {
 		Pair<Stereotype, Class> userActor = fixture.getMetaclassExtension("User", "Actor");
 		List<SpecializationTypeConfiguration> types = fixture.assertAllSpecializationTypes(userActor);
-		Set<String> hints = ImmutableSet.copyOf(transform(types, EMFFunctions.getFeature(ElementtypesconfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__HINT, String.class)));
+		Set<String> hints = ImmutableSet.copyOf(transform(types, EMFFunctions.getFeature(ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_CONFIGURATION__HINT, String.class)));
 		assertThat(hints, hasItems("2011", "2012"));
 	}
 
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/GenOption.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/GenOption.java
index 5a610f3cb98..a0bb865c9f9 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/GenOption.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/GenOption.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 /**
  * Test fixture model generation options.
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/GenOptions.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/GenOptions.java
index 560e0983536..7b2cc26335e 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/GenOptions.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/GenOptions.java
@@ -11,7 +11,7 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/ModelGenFixture.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java
index dc71c2f8e65..1161cfdb57a 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/ModelGenFixture.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ModelGenFixture.java
@@ -11,11 +11,11 @@
  *   
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.isEmpty;
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.lessThan;
-import static org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests.GenOption.SUPPRESS_SEMANTIC_SUPERTYPE;
+import static org.eclipse.papyrus.uml.profile.types.generator.tests.GenOption.SUPPRESS_SEMANTIC_SUPERTYPE;
 import static org.eclipse.uml2.common.util.UML2Util.getValidJavaIdentifier;
 import static org.hamcrest.CoreMatchers.everyItem;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -31,18 +31,18 @@ import java.util.regex.Pattern;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractAdviceBindingConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.AbstractMatcherConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.ElementTypeSetConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.AbstractMatcherConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.utils.JUnitUtils;
 import org.eclipse.papyrus.junit.utils.rules.ResourceSetFixture;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ElementTypesGenerator;
-import org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.Identifiers;
+import org.eclipse.papyrus.uml.profile.types.generator.ElementTypesGenerator;
+import org.eclipse.papyrus.uml.profile.types.generator.Identifiers;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
 import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.xtext.xbase.lib.Pair;
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/ProfilesWithPackageNestingTest.java b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ProfilesWithPackageNestingTest.java
index f155f9d8f1a..78b9e7ebb9d 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/src/org/eclipse/papyrus/uml/profile/elementtypesconfigurations/generator/tests/ProfilesWithPackageNestingTest.java
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/src/org/eclipse/papyrus/uml/profile/types/generator/tests/ProfilesWithPackageNestingTest.java
@@ -11,7 +11,7 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests;
+package org.eclipse.papyrus.uml.profile.types.generator.tests;
 
 import static org.eclipse.papyrus.junit.matchers.MoreMatchers.isEmpty;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -20,12 +20,12 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.eclipse.papyrus.infra.elementtypesconfigurations.IconEntry;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.SpecializationTypeConfiguration;
+import org.eclipse.papyrus.infra.types.IconEntry;
+import org.eclipse.papyrus.infra.types.SpecializationTypeConfiguration;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.applystereotypeadviceconfiguration.ApplyStereotypeAdviceConfiguration;
-import org.eclipse.papyrus.uml.elementtypesconfigurations.stereotypeapplicationmatcherconfiguration.StereotypeApplicationMatcherConfiguration;
+import org.eclipse.papyrus.uml.types.core.advices.applystereotype.ApplyStereotypeAdviceConfiguration;
+import org.eclipse.papyrus.uml.types.core.matchers.stereotype.StereotypeApplicationMatcherConfiguration;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.edit.UMLEditPlugin;
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
index 5e0f6e251e3..7d02149cb7c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
  org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
  org.eclipse.xtend.lib;bundle-version="2.8.1",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.elementtypesconfigurations;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.types;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.types.core;bundle-version="1.2.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.activity.tests,
  org.eclipse.papyrus.uml.diagram.activity.tests.canonical;x-friends:="org.eclipse.papyrus.uml.diagram.interactionoverview.tests",
  org.eclipse.papyrus.uml.diagram.activity.tests.generation
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramElementTypeConfigurationTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramElementTypeConfigurationTest.java
index 6b8564b5f52..91679bddccc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramElementTypeConfigurationTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramElementTypeConfigurationTest.java
@@ -21,16 +21,16 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * Test the compositediagram.elementtypesconfigurations model :
- *  - validate the model
+ * Test the compositediagram.typesconfigurations model :
+ * - validate the model
  * 
  * @author Benoit Maggi
  */
 public class CompositeDiagramElementTypeConfigurationTest {
-	
+
 	// path to the model
-	public static final String ELEMENT_TYPE_CONFIGURATION_MODEL_PATH = org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin.ID+"/model/compositediagram.elementtypesconfigurations"; //$NON-NLS-0$
-	
+	public static final String ELEMENT_TYPE_CONFIGURATION_MODEL_PATH = org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin.ID + "/model/compositediagram.typesconfigurations"; // $NON-NLS-0$
+
 	/**
 	 * Validate the model with the rules defined in the meta-model tooling
 	 */
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramNotationElementTypeConfigurationTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramNotationElementTypeConfigurationTest.java
index 118e9385499..ca7563fe73c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramNotationElementTypeConfigurationTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/test/org/eclipse/papyrus/uml/diagram/composite/test/model/CompositeDiagramNotationElementTypeConfigurationTest.java
@@ -22,15 +22,15 @@ import org.junit.Test;
 
 /**
  * Test the compositediagram-notation model :
- *  - validate the model
+ * - validate the model
  * 
  * @author Benoit Maggi
  */
 public class CompositeDiagramNotationElementTypeConfigurationTest {
-	
+
 	// path to the model
-	public static final String ELEMENT_TYPE_NOTATION_CONFIGURATION_MODEL_PATH = org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin.ID+"/model/compositediagram-notation.elementtypesconfigurations"; //$NON-NLS-0$
-	
+	public static final String ELEMENT_TYPE_NOTATION_CONFIGURATION_MODEL_PATH = org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin.ID + "/model/compositediagram-notation.typesconfigurations"; // $NON-NLS-0$
+
 	/**
 	 * Validate the model with the rules defined in the meta-model tooling
 	 */
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
index 77ba2b9e807..973434dbda0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.eclipse.core.resources;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",

+ org.eclipse.papyrus.infra.types;bundle-version="1.1.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",

  org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.1.0",

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
index 626214771f3..170f79bde94 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
             clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="resources/TestPalette.elementtypesconfigurations">
@@ -31,7 +31,7 @@
 
 	<!-- false palette declaraiton, with no corresponding profile applied -->
 <extension
-         point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration">
+         point="org.eclipse.papyrus.infra.types.core.elementTypeSetConfiguration">
       <elementTypeSet
             clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext"
             path="resources/FakeProfile.elementtypesconfigurations">
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
index f51cea9cf8c..f3c5eb3667b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/FakeProfile.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="FakeProfile" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" name="FakeClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="FakeProfile::FakeSto" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">
-      <requiredProfiles>FakeProfile</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.FakeProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="FakeProfile" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.fake.tests" name="FakeClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>FakeProfile::FakeSto</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.fakeadvice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="FakeProfile::FakeSto" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">

+      <requiredProfiles>FakeProfile</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
index 5f37a4b7b52..66c806d300d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/resources/TestPalette.elementtypesconfigurations
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.1" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestPaletteConfiguration" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">
-  <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" name="ClassWithStoOnClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
-    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration">
-      <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration">
-    <stereotypesToApply stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">
-      <requiredProfiles>TestPaletteConfiguration</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
+<?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" description="Element types configuration for test palette configuration plugin" identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.TestPaletteConfiguration" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="TestPaletteConfiguration" xmi:id="_ubJcsKeUEeSUR5jX0TaAcA" xmi:version="2.0">

+  <elementTypeConfigurations identifier="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests" name="ClassWithStoOnClass" xmi:id="_ubJcsaeUEeSUR5jX0TaAcA" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">

+    <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif" xmi:id="_ubJcsqeUEeSUR5jX0TaAcA"/>

+    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>

+    <matcherConfiguration xmi:id="_ubJcs6eUEeSUR5jX0TaAcA" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">

+      <stereotypesQualifiedNames>TestPaletteConfiguration::TPC_StoOnClass</stereotypesQualifiedNames>

+    </matcherConfiguration>

+  </elementTypeConfigurations>

+  <adviceBindingsConfigurations identifier="org.eclipse.papyrus.uml.paletteconfiguration.tests.advice" target="_ubJcsaeUEeSUR5jX0TaAcA" xmi:id="_ubJcyaeUEeSUR5jX0TaAcA" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">

+    <stereotypesToApply stereotypeQualifiedName="TestPaletteConfiguration::TPC_StoOnClass" xmi:id="_ubJcyqeUEeSUR5jX0TaAcA">

+      <requiredProfiles>TestPaletteConfiguration</requiredProfiles>

+    </stereotypesToApply>

+  </adviceBindingsConfigurations>

 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
index 805dc6d747c..9326c7c5298 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
@@ -39,9 +39,9 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java
index 2756a92791f..a69cc4af6c4 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateElementTest.java
@@ -37,9 +37,9 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java
index 524c455e1a4..c3e41379248 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/MoveElementTest.java
@@ -36,9 +36,9 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java
index b74284b3f31..a1a567f732c 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/SetFeatureTest.java
@@ -37,9 +37,9 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch
index 49279316ab9..26d851a5f34 100644
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.property.tests/PropertyGrammarTests.launch
@@ -33,8 +33,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.mountainminds.eclemma.asm@default:default,com.mountainminds.eclemma.core@default:default,com.mountainminds.eclemma.debug.ui.compatibility@default:default,com.mountainminds.eclemma.doc@default:default,com.mountainminds.eclemma.ui@default:default,com.sun.el@default:default,edu.umd.cs.findbugs.plugin.eclipse@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sf.eclipsecs.branding@default:default,net.sf.eclipsecs.checkstyle@default:default,net.sf.eclipsecs.core@default:default,net.sf.eclipsecs.doc@default:default,net.sf.eclipsecs.ui@default:default,org.antlr.runtime@default:default,org.apache.ant*1.9.4.v201410062020@default:default,org.apache.ant*1.9.4.v201504302020@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core*3.4.0.v20150304-0921@default:default,org.eclipse.ant.core*3.4.0.v20150428-1928@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buckminster.ant@default:default,org.eclipse.buckminster.cmdline@default:default,org.eclipse.buckminster.core@default:default,org.eclipse.buckminster.download@default:default,org.eclipse.buckminster.executor@default:default,org.eclipse.buckminster.fetcher@default:default,org.eclipse.buckminster.generic.ui@default:default,org.eclipse.buckminster.generic@default:default,org.eclipse.buckminster.git@default:default,org.eclipse.buckminster.installer@default:default,org.eclipse.buckminster.jarprocessor@default:default,org.eclipse.buckminster.jdt@default:default,org.eclipse.buckminster.junit@default:default,org.eclipse.buckminster.model.common.edit@default:default,org.eclipse.buckminster.model.common@default:default,org.eclipse.buckminster.mspec.edit@default:default,org.eclipse.buckminster.mspec.editor@default:default,org.eclipse.buckminster.mspec@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buckminster.pde.ui@default:default,org.eclipse.buckminster.pde@default:default,org.eclipse.buckminster.rmap.edit@default:default,org.eclipse.buckminster.rmap.editor@default:default,org.eclipse.buckminster.rmap.pde.edit@default:default,org.eclipse.buckminster.rmap.pde@default:default,org.eclipse.buckminster.rmap@default:default,org.eclipse.buckminster.runtime@default:default,org.eclipse.buckminster.sax@default:default,org.eclipse.buckminster.ui.dependency.visualizer@default:default,org.eclipse.buckminster.ui@default:default,org.eclipse.compare*3.5.600.v20141216-1556@default:default,org.eclipse.compare*3.5.600.v20150420-1449@default:default,org.eclipse.compare.core*3.5.500.v20141202-1337@default:default,org.eclipse.compare.core*3.5.500.v20150505-1058@default:default,org.eclipse.compare.win32@default:default,org.eclipse.core.commands*3.6.100.v20150311-0214@default:default,org.eclipse.core.commands*3.7.0.v20150422-0725@default:default,org.eclipse.core.contenttype*3.4.200.v20150316-1243@default:default,org.eclipse.core.contenttype*3.5.0.v20150421-2214@default:default,org.eclipse.core.databinding*1.4.100.v20150311-0216@default:default,org.eclipse.core.databinding*1.5.0.v20150422-0725@default:default,org.eclipse.core.databinding.beans*1.2.200.v20150311-0217@default:default,org.eclipse.core.databinding.beans*1.3.0.v20150422-0725@default:default,org.eclipse.core.databinding.observable*1.4.1.v20150311-0218@default:default,org.eclipse.core.databinding.observable*1.5.0.v20150422-0725@default:default,org.eclipse.core.databinding.property*1.4.200.v20150311-0218@default:default,org.eclipse.core.databinding.property*1.5.0.v20150422-0725@default:default,org.eclipse.core.expressions*3.4.600.v20150316-1244@default:default,org.eclipse.core.expressions*3.5.0.v20150421-2214@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem*1.5.0.v20150313-1707@default:default,org.eclipse.core.filesystem*1.5.0.v20150421-0713@default:default,org.eclipse.core.filesystem.java7*1.0.0.v20150304-0027@default:false,org.eclipse.core.filesystem.java7*1.0.100.v20150423-0754@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.jobs*3.7.0.v20150316-1238@default:default,org.eclipse.core.jobs*3.7.0.v20150330-2103@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources*3.10.0.v20150423-0755@default:default,org.eclipse.core.resources*3.9.100.v20150313-1707@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.runtime*3.11.0.v20150316-1241@default:true,org.eclipse.core.runtime*3.11.0.v20150405-1723@default:true,org.eclipse.core.runtime.compatibility*3.2.200.v20150218-1001@default:default,org.eclipse.core.runtime.compatibility*3.2.300.v20150423-0821@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.variables@default:default,org.eclipse.cvs*1.4.200.v20150430-1445@default:default,org.eclipse.cvs*1.4.200.v20150514-1000@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui*3.11.0.v20150303-1130@default:default,org.eclipse.debug.ui*3.11.0.v20150514-0917@default:default,org.eclipse.draw2d*3.10.0.201505040206@default:default,org.eclipse.draw2d*3.10.0.201505170205@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.e4.core.commands*0.10.2.v20150313-1340@default:default,org.eclipse.e4.core.commands*0.11.0.v20150422-0725@default:default,org.eclipse.e4.core.contexts*1.3.100.v20150316-1240@default:default,org.eclipse.e4.core.contexts*1.4.0.v20150421-2214@default:default,org.eclipse.e4.core.di*1.4.0.v20150316-1236@default:default,org.eclipse.e4.core.di*1.5.0.v20150421-2214@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions*0.12.0.v20150316-1245@default:default,org.eclipse.e4.core.di.extensions*0.13.0.v20150421-2214@default:default,org.eclipse.e4.core.services*2.0.0.v20150316-1145@default:default,org.eclipse.e4.core.services*2.0.0.v20150403-1912@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings*0.10.200.v20150313-1340@default:default,org.eclipse.e4.ui.bindings*0.11.0.v20150422-0725@default:default,org.eclipse.e4.ui.css.core*0.10.200.v20150223-1335@default:default,org.eclipse.e4.ui.css.core*0.11.0.v20150511-1937@default:default,org.eclipse.e4.ui.css.swt*0.11.200.v20150313-1341@default:default,org.eclipse.e4.ui.css.swt*0.12.0.v20150511-1003@default:default,org.eclipse.e4.ui.css.swt.theme*0.10.0.v20150422-0725@default:default,org.eclipse.e4.ui.css.swt.theme*0.9.300.v20150313-1341@default:default,org.eclipse.e4.ui.di*1.0.0.v20150309-0906@default:default,org.eclipse.e4.ui.di*1.1.0.v20150422-0725@default:default,org.eclipse.e4.ui.dialogs*1.0.0.v20150218-0943@default:default,org.eclipse.e4.ui.dialogs*1.0.0.v20150513-0856@default:default,org.eclipse.e4.ui.model.workbench*1.1.100.v20150311-1601@default:default,org.eclipse.e4.ui.model.workbench*1.1.100.v20150407-1430@default:default,org.eclipse.e4.ui.services*1.1.0.v20150315-0658@default:default,org.eclipse.e4.ui.services*1.2.0.v20150422-0725@default:default,org.eclipse.e4.ui.widgets*1.0.0.v20150315-0658@default:default,org.eclipse.e4.ui.widgets*1.1.0.v20150427-1751@default:default,org.eclipse.e4.ui.workbench*1.3.0.v20150316-1403@default:default,org.eclipse.e4.ui.workbench*1.3.0.v20150429-1329@default:default,org.eclipse.e4.ui.workbench.addons.swt*1.2.0.v20150315-0701@default:default,org.eclipse.e4.ui.workbench.addons.swt*1.2.0.v20150512-1414@default:default,org.eclipse.e4.ui.workbench.renderers.swt*0.12.100.v20150312-1938@default:default,org.eclipse.e4.ui.workbench.renderers.swt*0.13.0.v20150512-1850@default:default,org.eclipse.e4.ui.workbench.swt*0.12.100.v20150316-1403@default:default,org.eclipse.e4.ui.workbench.swt*0.13.0.v20150504-0621@default:default,org.eclipse.e4.ui.workbench3*0.12.0.v20150316-1403@default:default,org.eclipse.e4.ui.workbench3*0.13.0.v20150422-0725@default:default,org.eclipse.ecf*3.4.0.v20150506-1752@default:default,org.eclipse.ecf*3.4.0.v20150512-1727@default:default,org.eclipse.ecf.filetransfer*5.0.0.v20150506-1752@default:default,org.eclipse.ecf.filetransfer*5.0.0.v20150512-1727@default:default,org.eclipse.ecf.identity*3.5.0.v20150506-1752@default:default,org.eclipse.ecf.identity*3.5.0.v20150512-1727@default:default,org.eclipse.ecf.provider.filetransfer*3.2.200.v20150506-1752@default:default,org.eclipse.ecf.provider.filetransfer*3.2.200.v20150512-1727@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4*1.0.1043.v20150506-1752@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4*1.0.1043.v20150512-1727@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl*1.0.0.v20150506-1752@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl*1.0.0.v20150512-1727@default:false,org.eclipse.ecf.provider.filetransfer.ssl*1.0.0.v20150506-1752@default:false,org.eclipse.ecf.provider.filetransfer.ssl*1.0.0.v20150512-1727@default:false,org.eclipse.ecf.ssl*1.1.0.v20150506-1752@default:false,org.eclipse.ecf.ssl*1.1.0.v20150512-1727@default:false,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.fetchfactory@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf*2.6.0.v20150504-0831@default:default,org.eclipse.emf*2.6.0.v20150518-0831@default:default,org.eclipse.emf.ant*2.8.0.v20150504-0831@default:default,org.eclipse.emf.ant*2.8.0.v20150518-0831@default:default,org.eclipse.emf.cheatsheets*2.5.0.v20150504-0831@default:default,org.eclipse.emf.cheatsheets*2.5.0.v20150518-0831@default:default,org.eclipse.emf.codegen*2.11.0.v20150504-0831@default:default,org.eclipse.emf.codegen*2.11.0.v20150518-0831@default:default,org.eclipse.emf.codegen.ecore*2.11.0.v20150504-0831@default:default,org.eclipse.emf.codegen.ecore*2.11.0.v20150518-0831@default:default,org.eclipse.emf.codegen.ecore.ui*2.11.0.v20150504-0831@default:default,org.eclipse.emf.codegen.ecore.ui*2.11.0.v20150518-0831@default:default,org.eclipse.emf.codegen.ui*2.6.0.v20150504-0831@default:default,org.eclipse.emf.codegen.ui*2.6.0.v20150518-0831@default:default,org.eclipse.emf.common*2.11.0.v20150428-0315@default:default,org.eclipse.emf.common*2.11.0.v20150512-0501@default:default,org.eclipse.emf.common.ui*2.10.0.v20150504-0831@default:default,org.eclipse.emf.common.ui*2.10.0.v20150518-0831@default:default,org.eclipse.emf.converter*2.7.0.v20150504-0831@default:default,org.eclipse.emf.converter*2.7.0.v20150518-0831@default:default,org.eclipse.emf.databinding*1.3.0.v20150504-0831@default:default,org.eclipse.emf.databinding*1.3.0.v20150518-0831@default:default,org.eclipse.emf.databinding.edit*1.3.0.v20150504-0831@default:default,org.eclipse.emf.databinding.edit*1.3.0.v20150518-0831@default:default,org.eclipse.emf.doc*2.8.0.v20150504-0831@default:default,org.eclipse.emf.doc*2.8.0.v20150518-0831@default:default,org.eclipse.emf.ecore*2.11.0.v20150428-0315@default:default,org.eclipse.emf.ecore*2.11.0.v20150512-0501@default:default,org.eclipse.emf.ecore.change*2.11.0.v20150428-0315@default:default,org.eclipse.emf.ecore.change*2.11.0.v20150512-0501@default:default,org.eclipse.emf.ecore.change.edit*2.6.0.v20150504-0831@default:default,org.eclipse.emf.ecore.change.edit*2.6.0.v20150518-0831@default:default,org.eclipse.emf.ecore.edit*2.9.0.v20150504-0831@default:default,org.eclipse.emf.ecore.edit*2.9.0.v20150518-0831@default:default,org.eclipse.emf.ecore.editor*2.11.0.v20150504-0831@default:default,org.eclipse.emf.ecore.editor*2.11.0.v20150518-0831@default:default,org.eclipse.emf.ecore.xmi*2.11.0.v20150428-0315@default:default,org.eclipse.emf.ecore.xmi*2.11.0.v20150512-0501@default:default,org.eclipse.emf.edit*2.11.0.v20150504-0831@default:default,org.eclipse.emf.edit*2.11.0.v20150518-0831@default:default,org.eclipse.emf.edit.ui*2.11.0.v20150504-0831@default:default,org.eclipse.emf.edit.ui*2.11.0.v20150518-0831@default:default,org.eclipse.emf.example.installer*1.4.0.v20150504-0831@default:default,org.eclipse.emf.example.installer*1.4.0.v20150518-0831@default:default,org.eclipse.emf.exporter*2.7.0.v20150504-0831@default:default,org.eclipse.emf.exporter*2.7.0.v20150518-0831@default:default,org.eclipse.emf.importer*2.9.0.v20150504-0831@default:default,org.eclipse.emf.importer*2.9.0.v20150518-0831@default:default,org.eclipse.emf.importer.ecore*2.8.0.v20150504-0831@default:default,org.eclipse.emf.importer.ecore*2.8.0.v20150518-0831@default:default,org.eclipse.emf.importer.java*2.7.0.v20150504-0831@default:default,org.eclipse.emf.importer.java*2.7.0.v20150518-0831@default:default,org.eclipse.emf.importer.rose*2.8.0.v20150504-0831@default:default,org.eclipse.emf.importer.rose*2.8.0.v20150518-0831@default:default,org.eclipse.emf.mapping*2.9.0.v20150504-0831@default:default,org.eclipse.emf.mapping*2.9.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore*2.6.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore*2.6.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore.editor*2.6.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore.editor*2.6.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2ecore*2.9.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2ecore*2.9.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2ecore.editor*2.7.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2ecore.editor*2.7.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2xml*2.9.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2xml*2.9.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2xml.ui*2.8.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2xml.ui*2.8.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ui*2.7.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ui*2.7.0.v20150518-0831@default:default,org.eclipse.emf.mwe.core*1.3.10.v201503240644@default:default,org.eclipse.emf.mwe.core*1.3.10.v201505050723@default:default,org.eclipse.emf.mwe.utils*1.3.10.v201503240644@default:default,org.eclipse.emf.mwe.utils*1.3.10.v201505050723@default:default,org.eclipse.emf.mwe2.language*2.8.0.v201503240833@default:default,org.eclipse.emf.mwe2.language*2.8.0.v201505050939@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.launch*2.8.0.v201503240833@default:default,org.eclipse.emf.mwe2.launch*2.8.0.v201505050939@default:default,org.eclipse.emf.mwe2.lib*2.8.0.v201503240644@default:default,org.eclipse.emf.mwe2.lib*2.8.0.v201505050723@default:default,org.eclipse.emf.mwe2.runtime*2.8.0.v201503240644@default:default,org.eclipse.emf.mwe2.runtime*2.8.0.v201505050723@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction*1.9.0.201503250534@default:default,org.eclipse.emf.transaction*1.9.0.201505060251@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui*1.4.0.201503250534@default:default,org.eclipse.emf.transaction.ui*1.4.0.201505060251@default:default,org.eclipse.emf.validation*1.8.0.201503250348@default:default,org.eclipse.emf.validation*1.8.0.201505060134@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl*1.4.0.201503250348@default:default,org.eclipse.emf.validation.ocl*1.4.0.201505060134@default:default,org.eclipse.emf.validation.ui*1.7.0.201503250348@default:default,org.eclipse.emf.validation.ui*1.7.0.201505060134@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.workspace*1.5.1.201503250534@default:default,org.eclipse.emf.workspace*1.5.1.201505060251@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui*1.3.0.201503250534@default:default,org.eclipse.emf.workspace.ui*1.3.0.201505060251@default:default,org.eclipse.epp.logging.aeri.ui@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app*1.3.200.v20130910-1609@default:default,org.eclipse.equinox.app*1.3.300.v20150423-1356@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common*3.7.0.v20150318-1503@2:true,org.eclipse.equinox.common*3.7.0.v20150402-1709@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds*1.4.200.v20131126-2331@1:true,org.eclipse.equinox.ds*1.4.300.v20150423-1356@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin*2.0.100.v20131209-2144@default:default,org.eclipse.equinox.frameworkadmin*2.0.200.v20150423-1455@default:default,org.eclipse.equinox.frameworkadmin.equinox*1.0.500.v20150304-1709@default:default,org.eclipse.equinox.frameworkadmin.equinox*1.0.600.v20150427-1907@default:default,org.eclipse.equinox.http.jetty*3.1.0.v20150319-1742@default:default,org.eclipse.equinox.http.jetty*3.1.0.v20150323-1312@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet*1.2.0.v20150319-1742@default:default,org.eclipse.equinox.http.servlet*1.2.0.v20150428-1940@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher*1.3.0.v20140415-2008@default:default,org.eclipse.equinox.launcher*1.3.100.v20150511-1540@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64*1.1.200.v20150320-0346@default:false,org.eclipse.equinox.launcher.win32.win32.x86_64*1.1.300.v20150513-1722@default:false,org.eclipse.equinox.p2.artifact.repository*1.1.300.v20150226-1713@default:default,org.eclipse.equinox.p2.artifact.repository*1.1.400.v20150513-2116@default:default,org.eclipse.equinox.p2.console*1.0.300.v20150226-1713@default:default,org.eclipse.equinox.p2.console*1.0.400.v20150423-1455@default:default,org.eclipse.equinox.p2.core*2.4.0.v20150226-1713@default:default,org.eclipse.equinox.p2.core*2.4.0.v20150424-1429@default:default,org.eclipse.equinox.p2.director*2.3.100.v20150226-1713@default:default,org.eclipse.equinox.p2.director*2.3.200.v20150423-1455@default:default,org.eclipse.equinox.p2.director.app*1.0.300.v20150308-0324@default:default,org.eclipse.equinox.p2.director.app*1.0.400.v20150423-1455@default:default,org.eclipse.equinox.p2.directorywatcher*1.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.directorywatcher*1.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine*2.3.0.v20150226-1713@default:default,org.eclipse.equinox.p2.engine*2.4.0.v20150511-1532@default:default,org.eclipse.equinox.p2.extensionlocation*1.2.100.v20150226-1713@default:default,org.eclipse.equinox.p2.extensionlocation*1.2.200.v20150423-1455@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor*1.0.300.v20131211-1531@default:default,org.eclipse.equinox.p2.jarprocessor*1.0.400.v20150430-1836@default:default,org.eclipse.equinox.p2.metadata*2.2.0.v20150216-2211@default:default,org.eclipse.equinox.p2.metadata*2.3.0.v20150511-1532@default:default,org.eclipse.equinox.p2.metadata.repository*1.2.100.v20150226-1713@default:default,org.eclipse.equinox.p2.metadata.repository*1.2.200.v20150428-1613@default:default,org.eclipse.equinox.p2.operations*2.4.0.v20150226-1713@default:default,org.eclipse.equinox.p2.operations*2.4.100.v20150423-1455@default:default,org.eclipse.equinox.p2.publisher.eclipse*1.1.200.v20150319-1551@default:default,org.eclipse.equinox.p2.publisher.eclipse*1.1.300.v20150423-1455@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins*1.1.200.v20150226-1713@default:default,org.eclipse.equinox.p2.reconciler.dropins*1.1.300.v20150423-1455@default:default,org.eclipse.equinox.p2.repository*2.3.0.v20150311-0407@default:default,org.eclipse.equinox.p2.repository*2.3.100.v20150428-1613@default:default,org.eclipse.equinox.p2.repository.tools*2.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.repository.tools*2.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.touchpoint.eclipse*2.1.200.v20150304-1709@default:default,org.eclipse.equinox.p2.touchpoint.eclipse*2.1.300.v20150423-1455@default:default,org.eclipse.equinox.p2.touchpoint.natives*1.2.0.v20150226-1713@default:default,org.eclipse.equinox.p2.touchpoint.natives*1.2.0.v20150424-1456@default:default,org.eclipse.equinox.p2.transport.ecf*1.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.transport.ecf*1.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.ui*2.4.0.v20150226-1713@default:default,org.eclipse.equinox.p2.ui*2.4.0.v20150425-0422@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport*1.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.ui.importexport*1.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.ui.sdk*1.0.300.v20140407-1803@default:default,org.eclipse.equinox.p2.ui.sdk*1.0.400.v20150423-1455@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler*1.2.0.v20150226-1713@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler*1.2.100.v20150423-1455@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite*1.0.400.v20150224-1702@default:default,org.eclipse.equinox.p2.updatesite*1.0.500.v20150423-1455@default:default,org.eclipse.equinox.preferences*3.5.300.v20150313-2125@default:default,org.eclipse.equinox.preferences*3.5.300.v20150408-1437@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security*1.2.0.v20150223-1455@default:default,org.eclipse.equinox.security*1.2.100.v20150423-1356@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.simpleconfigurator*1.1.0.v20131217-1203@1:true,org.eclipse.equinox.simpleconfigurator*1.1.100.v20150423-1455@1:true,org.eclipse.equinox.simpleconfigurator.manipulator*2.0.0.v20150121-1551@default:default,org.eclipse.equinox.simpleconfigurator.manipulator*2.0.100.v20150423-1455@default:default,org.eclipse.equinox.util@default:default,org.eclipse.gef*3.10.0.201505040206@default:default,org.eclipse.gef*3.10.0.201505170205@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui*1.8.1.201503261653@default:default,org.eclipse.gmf.runtime.common.ui*1.8.1.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.action*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.action*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.action.ide*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.action.ide*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.printing*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.printing*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.services*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.services*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.services.action*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.services.action*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.services.properties*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui*1.8.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui*1.8.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.actions*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.actions*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.printing*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render*1.8.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render*1.8.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.properties*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.properties*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.providers*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.providers*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.render*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.render*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.draw2d.ui*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.draw2d.ui*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.draw2d.ui.render*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.draw2d.ui.render*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt*1.8.0.201503261653@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt*1.8.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.clipboard.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.clipboard.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.commands.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.commands.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.type.core*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.type.core*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.ui*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.ui.properties*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.ui.properties*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.gef.ui*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.gef.ui*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation*1.8.0.201503250354@default:default,org.eclipse.gmf.runtime.notation*1.8.0.201505060039@default:default,org.eclipse.gmf.runtime.notation.edit*1.7.0.201503250354@default:default,org.eclipse.gmf.runtime.notation.edit*1.7.0.201505060039@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime*3.2.0.201412171959@default:default,org.eclipse.gmf.tooling.runtime*3.2.0.201505032108@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base*4.0.300.v20150320-0800@default:default,org.eclipse.help.base*4.0.300.v20150514-1000@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp*3.7.0.v20150226-2129@default:default,org.eclipse.help.webapp*3.7.0.v20150425-0643@default:default,org.eclipse.help@default:default,org.eclipse.jdt*3.11.0.v20150430-1445@default:default,org.eclipse.jdt*3.11.0.v20150514-1000@default:default,org.eclipse.jdt.annotation*1.1.100.v20140704-0625@default:default,org.eclipse.jdt.annotation*2.0.100.v20150311-1658@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt*1.2.0.v20150424-1830@default:false,org.eclipse.jdt.compiler.apt*1.2.0.v20150514-0146@default:false,org.eclipse.jdt.compiler.tool*1.1.0.v20150423-0947@default:false,org.eclipse.jdt.compiler.tool*1.1.0.v20150513-2007@default:false,org.eclipse.jdt.core*3.11.0.v20150429-0810@default:default,org.eclipse.jdt.core*3.11.0.v20150513-2030@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.debug.ui*3.7.0.v20150414-0909@default:default,org.eclipse.jdt.debug.ui*3.7.0.v20150505-1916@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv*3.11.0.v20150401-1527@default:default,org.eclipse.jdt.doc.isv*3.11.0.v20150513-1616@default:default,org.eclipse.jdt.doc.user*3.11.0.v20150429-1030@default:default,org.eclipse.jdt.doc.user*3.11.0.v20150513-1723@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui*3.11.0.v20150428-1805@default:default,org.eclipse.jdt.ui*3.11.0.v20150513-1857@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface*3.11.0.v20150313-1544@default:default,org.eclipse.jface*3.11.0.v20150511-1340@default:default,org.eclipse.jface.databinding*1.7.0.v20150315-0701@default:default,org.eclipse.jface.databinding*1.7.0.v20150406-2148@default:default,org.eclipse.jface.text*3.10.0.v20150112-1146@default:default,org.eclipse.jface.text*3.10.0.v20150428-1301@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.java7@default:false,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml*3.5.0.v20150324-1740@default:default,org.eclipse.m2m.qvt.oml*3.5.0.v20150505-0519@default:default,org.eclipse.m2m.qvt.oml.common*3.5.0.v20150224-1209@default:default,org.eclipse.m2m.qvt.oml.common*3.5.0.v20150429-1352@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util*3.5.0.v20150129-1251@default:default,org.eclipse.m2m.qvt.oml.emf.util*3.5.0.v20150419-1233@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime*3.5.0.v20150324-1740@default:default,org.eclipse.m2m.qvt.oml.runtime*3.5.0.v20150505-0519@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ide@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.help.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.pde.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.bugs@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.ocl*3.5.0.v20150321-0925@default:default,org.eclipse.ocl*3.5.0.v20150410-1135@default:default,org.eclipse.ocl.common.ui*1.2.0.v20140819-1517@default:default,org.eclipse.ocl.common.ui*1.2.0.v20150410-1119@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore*3.3.200.v20150110-2335@default:default,org.eclipse.ocl.ecore*3.3.200.v20150330-1704@default:default,org.eclipse.ocl.examples.debug*2.0.0.v20150208-1848@default:default,org.eclipse.ocl.examples.debug*2.0.0.v20150410-1125@default:default,org.eclipse.ocl.examples.debug.vm*2.0.0.v20150208-2149@default:default,org.eclipse.ocl.examples.debug.vm*2.0.0.v20150410-1125@default:default,org.eclipse.ocl.examples.ui*1.3.0.v20141108-1747@default:default,org.eclipse.ocl.examples.ui*1.3.0.v20150410-1125@default:default,org.eclipse.ocl.examples.xtext.console*4.0.0.v20150208-1844@default:default,org.eclipse.ocl.examples.xtext.console*4.0.0.v20150424-1841@default:default,org.eclipse.ocl.jdt.annotation7@default:default,org.eclipse.ocl.pivot*1.0.0.v20150323-1850@default:default,org.eclipse.ocl.pivot*1.0.0.v20150504-1704@default:default,org.eclipse.ocl.pivot.ui*1.0.0.v20150122-1254@default:default,org.eclipse.ocl.pivot.ui*1.0.0.v20150410-1125@default:default,org.eclipse.ocl.pivot.uml*1.0.0.v20150317-1133@default:default,org.eclipse.ocl.pivot.uml*1.0.0.v20150416-1648@default:default,org.eclipse.ocl.xtext.base*1.0.0.v20150320-1757@default:default,org.eclipse.ocl.xtext.base*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.base.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.base.ui*1.0.0.v20150503-2043@default:default,org.eclipse.ocl.xtext.completeocl*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.completeocl*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.completeocl.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.completeocl.ui*1.0.0.v20150424-1832@default:default,org.eclipse.ocl.xtext.essentialocl*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.essentialocl*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.essentialocl.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.essentialocl.ui*1.0.0.v20150410-1232@default:default,org.eclipse.ocl.xtext.markup*1.0.0.v20150320-1757@default:default,org.eclipse.ocl.xtext.markup*1.0.0.v20150429-2115@default:default,org.eclipse.ocl.xtext.markup.ui*1.0.0.v20150226-1501@default:default,org.eclipse.ocl.xtext.markup.ui*1.0.0.v20150410-1125@default:default,org.eclipse.ocl.xtext.oclinecore*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclinecore*1.0.0.v20150429-2115@default:default,org.eclipse.ocl.xtext.oclinecore.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclinecore.ui*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.oclstdlib*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclstdlib*1.0.0.v20150429-2115@default:default,org.eclipse.ocl.xtext.oclstdlib.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclstdlib.ui*1.0.0.v20150424-1832@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo.win32.x86_64@default:false,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.projectcopy@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.osgi*3.10.100.v20150318-0312@-1:true,org.eclipse.osgi*3.10.100.v20150420-1253@-1:true,org.eclipse.osgi.compatibility.state*1.0.100.v20140702-1948@default:false,org.eclipse.osgi.compatibility.state*1.0.100.v20150402-1551@default:false,org.eclipse.osgi.services*3.5.0.v20150225-1427@default:default,org.eclipse.osgi.services*3.5.0.v20150428-1938@default:default,org.eclipse.osgi.util*3.3.0.v20131023-1243@default:default,org.eclipse.osgi.util*3.3.100.v20150423-1351@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc*1.1.0.201505061653@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc*1.1.0.201505201124@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc*1.1.0.201505061653@default:default,org.eclipse.papyrus.emf.facet.efacet.doc*1.1.0.201505201124@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc*1.1.0.201505061653@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc*1.1.0.201505201124@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.edit@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.edit@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.emf@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.emf@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.sync*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries*1.1.0.201505061653@default:default,org.eclipse.papyrus.uml.alf.libraries*1.1.0.201505201124@default:default,org.eclipse.papyrus.uml.alf.to.fuml*1.1.0.201505061653@default:default,org.eclipse.papyrus.uml.alf.to.fuml*1.1.0.201505201124@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.elementtypesconfigurations@default:default,org.eclipse.papyrus.uml.elementtypesconfigurations@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.pde*3.11.0.v20150430-1445@default:default,org.eclipse.pde*3.11.0.v20150514-1000@default:default,org.eclipse.pde.api.tools*1.0.700.v20150424-1421@default:default,org.eclipse.pde.api.tools*1.0.700.v20150513-0819@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ee.cdcfoundation10@default:false,org.eclipse.pde.api.tools.ee.cdcfoundation11@default:false,org.eclipse.pde.api.tools.ee.j2se12@default:false,org.eclipse.pde.api.tools.ee.j2se13@default:false,org.eclipse.pde.api.tools.ee.j2se14@default:false,org.eclipse.pde.api.tools.ee.j2se15@default:false,org.eclipse.pde.api.tools.ee.javase16@default:false,org.eclipse.pde.api.tools.ee.javase17@default:false,org.eclipse.pde.api.tools.ee.javase18@default:false,org.eclipse.pde.api.tools.ee.jre11@default:false,org.eclipse.pde.api.tools.ee.osgiminimum10@default:false,org.eclipse.pde.api.tools.ee.osgiminimum11@default:false,org.eclipse.pde.api.tools.ee.osgiminimum12@default:false,org.eclipse.pde.api.tools.ui*1.0.600.v20150428-1008@default:default,org.eclipse.pde.api.tools.ui*1.0.600.v20150513-0819@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user*3.11.0.v20150401-1527@default:default,org.eclipse.pde.doc.user*3.11.0.v20150513-1616@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui*1.0.400.v20150428-1008@default:default,org.eclipse.pde.ds.ui*1.0.400.v20150506-1709@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui*1.0.400.v20150427-1238@default:default,org.eclipse.pde.ua.ui*1.0.400.v20150513-1136@default:default,org.eclipse.pde.ui*3.8.200.v20150428-1042@default:default,org.eclipse.pde.ui*3.8.200.v20150513-0844@default:default,org.eclipse.pde.ui.templates*3.5.0.v20150421-1428@default:default,org.eclipse.pde.ui.templates*3.5.0.v20150506-2103@default:default,org.eclipse.platform*4.5.0.v20150320-0800@default:default,org.eclipse.platform*4.5.0.v20150514-1000@default:default,org.eclipse.platform.doc.isv*4.5.0.v20150318-1609@default:default,org.eclipse.platform.doc.isv*4.5.0.v20150513-1616@default:default,org.eclipse.platform.doc.user*4.5.0.v20150213-0817@default:default,org.eclipse.platform.doc.user*4.5.0.v20150324-0903@default:default,org.eclipse.rcp*4.5.0.v20150320-0800@default:default,org.eclipse.rcp*4.5.0.v20150514-1000@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt*3.104.0.v20150319-1901@default:default,org.eclipse.swt*3.104.0.v20150513-1901@default:default,org.eclipse.swt.tools@default:default,org.eclipse.swt.win32.win32.x86_64*3.104.0.v20150319-1901@default:false,org.eclipse.swt.win32.win32.x86_64*3.104.0.v20150513-1901@default:false,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.generator.jdt@default:default,org.eclipse.swtbot.generator.rules.workbench@default:default,org.eclipse.swtbot.generator.ui@default:default,org.eclipse.swtbot.generator@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text*3.5.400.v20140915-2351@default:default,org.eclipse.text*3.5.400.v20150505-1044@default:default,org.eclipse.ui*3.107.0.v20150315-0703@default:default,org.eclipse.ui*3.107.0.v20150507-1945@default:default,org.eclipse.ui.browser*3.4.300.v20150315-1252@default:default,org.eclipse.ui.browser*3.4.300.v20150429-0602@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console*3.6.0.v20150310-1028@default:default,org.eclipse.ui.console*3.6.0.v20150512-1341@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms*3.6.200.v20150315-1254@default:default,org.eclipse.ui.forms*3.6.200.v20150506-2029@default:default,org.eclipse.ui.ide*3.11.0.v20150309-2044@default:default,org.eclipse.ui.ide*3.11.0.v20150510-1749@default:default,org.eclipse.ui.ide.application*1.0.600.v20150315-1254@default:default,org.eclipse.ui.ide.application*1.1.0.v20150422-0725@default:default,org.eclipse.ui.intro.universal*3.2.800.v20150317-1532@default:default,org.eclipse.ui.intro.universal*3.2.800.v20150325-0952@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring*1.0.0.v20150228-1728@default:default,org.eclipse.ui.monitoring*1.0.0.v20150512-1436@default:default,org.eclipse.ui.navigator*3.5.500.v20150315-1254@default:default,org.eclipse.ui.navigator*3.6.0.v20150422-0725@default:default,org.eclipse.ui.navigator.resources*3.4.800.v20150315-1254@default:default,org.eclipse.ui.navigator.resources*3.5.0.v20150422-0725@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes*1.1.0.v20150313-1033@default:default,org.eclipse.ui.themes*1.1.0.v20150511-0913@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views*3.7.100.v20150316-1432@default:default,org.eclipse.ui.views*3.8.0.v20150422-0725@default:default,org.eclipse.ui.views.log*1.0.600.v20141222-0829@default:default,org.eclipse.ui.views.log*1.0.600.v20150513-1840@default:default,org.eclipse.ui.views.properties.tabbed*3.6.0.v20150315-1254@default:default,org.eclipse.ui.views.properties.tabbed*3.6.100.v20150423-0822@default:default,org.eclipse.ui.win32*3.2.400.v20150315-1253@default:false,org.eclipse.ui.win32*3.2.500.v20150423-0822@default:false,org.eclipse.ui.workbench*3.107.0.v20150318-2200@default:default,org.eclipse.ui.workbench*3.107.0.v20150510-1732@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.uml2*5.0.0.v20150504-0916@default:default,org.eclipse.uml2*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.ant*1.0.0.v20150504-0916@default:default,org.eclipse.uml2.ant*1.0.0.v20150518-2047@default:default,org.eclipse.uml2.codegen.ecore*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.codegen.ecore*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.codegen.ecore.ui*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.codegen.ecore.ui*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.common*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.common*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.common.edit*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.common.edit*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.doc*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.doc*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.examples*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.examples*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.examples.uml.ui*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.examples.uml.ui*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.types*2.0.0.v20150504-0916@default:default,org.eclipse.uml2.types*2.0.0.v20150518-2047@default:default,org.eclipse.uml2.uml*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.ecore.exporter*3.0.0.v20150504-0916@default:default,org.eclipse.uml2.uml.ecore.exporter*3.0.0.v20150518-2047@default:default,org.eclipse.uml2.uml.ecore.importer*3.0.0.v20150504-0916@default:default,org.eclipse.uml2.uml.ecore.importer*3.0.0.v20150518-2047@default:default,org.eclipse.uml2.uml.edit*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml.edit*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.editor*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml.editor*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.profile.standard*1.0.100.v20150504-0916@default:default,org.eclipse.uml2.uml.profile.standard*1.0.100.v20150518-2047@default:default,org.eclipse.uml2.uml.resources*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml.resources*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.validation*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.uml.validation*5.0.0.v20150518-2047@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver*1.2.100.v201305141634@default:default,org.eclipse.wst.common.uriresolver*1.2.100.v201504151458@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand*2.1.0.v201503240650@default:default,org.eclipse.xpand*2.1.0.v201505051058@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend*2.1.0.v201503240650@default:default,org.eclipse.xtend*2.1.0.v201505051058@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf*2.1.0.v201503240650@default:default,org.eclipse.xtend.typesystem.emf*2.1.0.v201505051058@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.jacoco.agent@default:default,org.jacoco.core@default:default,org.jacoco.report@default:default,org.jsoup@default:default,org.junit@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.extendedtypes.emf@default:default,org.eclipse.papyrus.customization.extendedtypes.uml@default:default,org.eclipse.papyrus.customization.extendedtypes@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties.tests@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.elementtypesconfigurations.developer@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.edit@default:default,org.eclipse.papyrus.infra.core.serviceregistry.editor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.tests@default:false,org.eclipse.papyrus.infra.core.serviceregistry@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.edit@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.editor@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.emf@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.invarianttypes@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations.tests@default:default,org.eclipse.papyrus.infra.elementtypesconfigurations@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.editor@default:default,org.eclipse.papyrus.infra.emf.embeddededitor@default:default,org.eclipse.papyrus.infra.emf.facet.queries@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.elementtypeview@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.tests@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.tools@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.search.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:false,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.ui@default:default,org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.doc@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.textual.editors.example@default:default,org.eclipse.papyrus.uml.elementtypesconfigurations@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.mountainminds.eclemma.asm@default:default,com.mountainminds.eclemma.core@default:default,com.mountainminds.eclemma.debug.ui.compatibility@default:default,com.mountainminds.eclemma.doc@default:default,com.mountainminds.eclemma.ui@default:default,com.sun.el@default:default,edu.umd.cs.findbugs.plugin.eclipse@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sf.eclipsecs.branding@default:default,net.sf.eclipsecs.checkstyle@default:default,net.sf.eclipsecs.core@default:default,net.sf.eclipsecs.doc@default:default,net.sf.eclipsecs.ui@default:default,org.antlr.runtime@default:default,org.apache.ant*1.9.4.v201410062020@default:default,org.apache.ant*1.9.4.v201504302020@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core*3.4.0.v20150304-0921@default:default,org.eclipse.ant.core*3.4.0.v20150428-1928@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buckminster.ant@default:default,org.eclipse.buckminster.cmdline@default:default,org.eclipse.buckminster.core@default:default,org.eclipse.buckminster.download@default:default,org.eclipse.buckminster.executor@default:default,org.eclipse.buckminster.fetcher@default:default,org.eclipse.buckminster.generic.ui@default:default,org.eclipse.buckminster.generic@default:default,org.eclipse.buckminster.git@default:default,org.eclipse.buckminster.installer@default:default,org.eclipse.buckminster.jarprocessor@default:default,org.eclipse.buckminster.jdt@default:default,org.eclipse.buckminster.junit@default:default,org.eclipse.buckminster.model.common.edit@default:default,org.eclipse.buckminster.model.common@default:default,org.eclipse.buckminster.mspec.edit@default:default,org.eclipse.buckminster.mspec.editor@default:default,org.eclipse.buckminster.mspec@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buckminster.pde.ui@default:default,org.eclipse.buckminster.pde@default:default,org.eclipse.buckminster.rmap.edit@default:default,org.eclipse.buckminster.rmap.editor@default:default,org.eclipse.buckminster.rmap.pde.edit@default:default,org.eclipse.buckminster.rmap.pde@default:default,org.eclipse.buckminster.rmap@default:default,org.eclipse.buckminster.runtime@default:default,org.eclipse.buckminster.sax@default:default,org.eclipse.buckminster.ui.dependency.visualizer@default:default,org.eclipse.buckminster.ui@default:default,org.eclipse.compare*3.5.600.v20141216-1556@default:default,org.eclipse.compare*3.5.600.v20150420-1449@default:default,org.eclipse.compare.core*3.5.500.v20141202-1337@default:default,org.eclipse.compare.core*3.5.500.v20150505-1058@default:default,org.eclipse.compare.win32@default:default,org.eclipse.core.commands*3.6.100.v20150311-0214@default:default,org.eclipse.core.commands*3.7.0.v20150422-0725@default:default,org.eclipse.core.contenttype*3.4.200.v20150316-1243@default:default,org.eclipse.core.contenttype*3.5.0.v20150421-2214@default:default,org.eclipse.core.databinding*1.4.100.v20150311-0216@default:default,org.eclipse.core.databinding*1.5.0.v20150422-0725@default:default,org.eclipse.core.databinding.beans*1.2.200.v20150311-0217@default:default,org.eclipse.core.databinding.beans*1.3.0.v20150422-0725@default:default,org.eclipse.core.databinding.observable*1.4.1.v20150311-0218@default:default,org.eclipse.core.databinding.observable*1.5.0.v20150422-0725@default:default,org.eclipse.core.databinding.property*1.4.200.v20150311-0218@default:default,org.eclipse.core.databinding.property*1.5.0.v20150422-0725@default:default,org.eclipse.core.expressions*3.4.600.v20150316-1244@default:default,org.eclipse.core.expressions*3.5.0.v20150421-2214@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem*1.5.0.v20150313-1707@default:default,org.eclipse.core.filesystem*1.5.0.v20150421-0713@default:default,org.eclipse.core.filesystem.java7*1.0.0.v20150304-0027@default:false,org.eclipse.core.filesystem.java7*1.0.100.v20150423-0754@default:false,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.jobs*3.7.0.v20150316-1238@default:default,org.eclipse.core.jobs*3.7.0.v20150330-2103@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources*3.10.0.v20150423-0755@default:default,org.eclipse.core.resources*3.9.100.v20150313-1707@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.runtime*3.11.0.v20150316-1241@default:true,org.eclipse.core.runtime*3.11.0.v20150405-1723@default:true,org.eclipse.core.runtime.compatibility*3.2.200.v20150218-1001@default:default,org.eclipse.core.runtime.compatibility*3.2.300.v20150423-0821@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.variables@default:default,org.eclipse.cvs*1.4.200.v20150430-1445@default:default,org.eclipse.cvs*1.4.200.v20150514-1000@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui*3.11.0.v20150303-1130@default:default,org.eclipse.debug.ui*3.11.0.v20150514-0917@default:default,org.eclipse.draw2d*3.10.0.201505040206@default:default,org.eclipse.draw2d*3.10.0.201505170205@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.e4.core.commands*0.10.2.v20150313-1340@default:default,org.eclipse.e4.core.commands*0.11.0.v20150422-0725@default:default,org.eclipse.e4.core.contexts*1.3.100.v20150316-1240@default:default,org.eclipse.e4.core.contexts*1.4.0.v20150421-2214@default:default,org.eclipse.e4.core.di*1.4.0.v20150316-1236@default:default,org.eclipse.e4.core.di*1.5.0.v20150421-2214@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions*0.12.0.v20150316-1245@default:default,org.eclipse.e4.core.di.extensions*0.13.0.v20150421-2214@default:default,org.eclipse.e4.core.services*2.0.0.v20150316-1145@default:default,org.eclipse.e4.core.services*2.0.0.v20150403-1912@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings*0.10.200.v20150313-1340@default:default,org.eclipse.e4.ui.bindings*0.11.0.v20150422-0725@default:default,org.eclipse.e4.ui.css.core*0.10.200.v20150223-1335@default:default,org.eclipse.e4.ui.css.core*0.11.0.v20150511-1937@default:default,org.eclipse.e4.ui.css.swt*0.11.200.v20150313-1341@default:default,org.eclipse.e4.ui.css.swt*0.12.0.v20150511-1003@default:default,org.eclipse.e4.ui.css.swt.theme*0.10.0.v20150422-0725@default:default,org.eclipse.e4.ui.css.swt.theme*0.9.300.v20150313-1341@default:default,org.eclipse.e4.ui.di*1.0.0.v20150309-0906@default:default,org.eclipse.e4.ui.di*1.1.0.v20150422-0725@default:default,org.eclipse.e4.ui.dialogs*1.0.0.v20150218-0943@default:default,org.eclipse.e4.ui.dialogs*1.0.0.v20150513-0856@default:default,org.eclipse.e4.ui.model.workbench*1.1.100.v20150311-1601@default:default,org.eclipse.e4.ui.model.workbench*1.1.100.v20150407-1430@default:default,org.eclipse.e4.ui.services*1.1.0.v20150315-0658@default:default,org.eclipse.e4.ui.services*1.2.0.v20150422-0725@default:default,org.eclipse.e4.ui.widgets*1.0.0.v20150315-0658@default:default,org.eclipse.e4.ui.widgets*1.1.0.v20150427-1751@default:default,org.eclipse.e4.ui.workbench*1.3.0.v20150316-1403@default:default,org.eclipse.e4.ui.workbench*1.3.0.v20150429-1329@default:default,org.eclipse.e4.ui.workbench.addons.swt*1.2.0.v20150315-0701@default:default,org.eclipse.e4.ui.workbench.addons.swt*1.2.0.v20150512-1414@default:default,org.eclipse.e4.ui.workbench.renderers.swt*0.12.100.v20150312-1938@default:default,org.eclipse.e4.ui.workbench.renderers.swt*0.13.0.v20150512-1850@default:default,org.eclipse.e4.ui.workbench.swt*0.12.100.v20150316-1403@default:default,org.eclipse.e4.ui.workbench.swt*0.13.0.v20150504-0621@default:default,org.eclipse.e4.ui.workbench3*0.12.0.v20150316-1403@default:default,org.eclipse.e4.ui.workbench3*0.13.0.v20150422-0725@default:default,org.eclipse.ecf*3.4.0.v20150506-1752@default:default,org.eclipse.ecf*3.4.0.v20150512-1727@default:default,org.eclipse.ecf.filetransfer*5.0.0.v20150506-1752@default:default,org.eclipse.ecf.filetransfer*5.0.0.v20150512-1727@default:default,org.eclipse.ecf.identity*3.5.0.v20150506-1752@default:default,org.eclipse.ecf.identity*3.5.0.v20150512-1727@default:default,org.eclipse.ecf.provider.filetransfer*3.2.200.v20150506-1752@default:default,org.eclipse.ecf.provider.filetransfer*3.2.200.v20150512-1727@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4*1.0.1043.v20150506-1752@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4*1.0.1043.v20150512-1727@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl*1.0.0.v20150506-1752@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl*1.0.0.v20150512-1727@default:false,org.eclipse.ecf.provider.filetransfer.ssl*1.0.0.v20150506-1752@default:false,org.eclipse.ecf.provider.filetransfer.ssl*1.0.0.v20150512-1727@default:false,org.eclipse.ecf.ssl*1.1.0.v20150506-1752@default:false,org.eclipse.ecf.ssl*1.1.0.v20150512-1727@default:false,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.fetchfactory@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf*2.6.0.v20150504-0831@default:default,org.eclipse.emf*2.6.0.v20150518-0831@default:default,org.eclipse.emf.ant*2.8.0.v20150504-0831@default:default,org.eclipse.emf.ant*2.8.0.v20150518-0831@default:default,org.eclipse.emf.cheatsheets*2.5.0.v20150504-0831@default:default,org.eclipse.emf.cheatsheets*2.5.0.v20150518-0831@default:default,org.eclipse.emf.codegen*2.11.0.v20150504-0831@default:default,org.eclipse.emf.codegen*2.11.0.v20150518-0831@default:default,org.eclipse.emf.codegen.ecore*2.11.0.v20150504-0831@default:default,org.eclipse.emf.codegen.ecore*2.11.0.v20150518-0831@default:default,org.eclipse.emf.codegen.ecore.ui*2.11.0.v20150504-0831@default:default,org.eclipse.emf.codegen.ecore.ui*2.11.0.v20150518-0831@default:default,org.eclipse.emf.codegen.ui*2.6.0.v20150504-0831@default:default,org.eclipse.emf.codegen.ui*2.6.0.v20150518-0831@default:default,org.eclipse.emf.common*2.11.0.v20150428-0315@default:default,org.eclipse.emf.common*2.11.0.v20150512-0501@default:default,org.eclipse.emf.common.ui*2.10.0.v20150504-0831@default:default,org.eclipse.emf.common.ui*2.10.0.v20150518-0831@default:default,org.eclipse.emf.converter*2.7.0.v20150504-0831@default:default,org.eclipse.emf.converter*2.7.0.v20150518-0831@default:default,org.eclipse.emf.databinding*1.3.0.v20150504-0831@default:default,org.eclipse.emf.databinding*1.3.0.v20150518-0831@default:default,org.eclipse.emf.databinding.edit*1.3.0.v20150504-0831@default:default,org.eclipse.emf.databinding.edit*1.3.0.v20150518-0831@default:default,org.eclipse.emf.doc*2.8.0.v20150504-0831@default:default,org.eclipse.emf.doc*2.8.0.v20150518-0831@default:default,org.eclipse.emf.ecore*2.11.0.v20150428-0315@default:default,org.eclipse.emf.ecore*2.11.0.v20150512-0501@default:default,org.eclipse.emf.ecore.change*2.11.0.v20150428-0315@default:default,org.eclipse.emf.ecore.change*2.11.0.v20150512-0501@default:default,org.eclipse.emf.ecore.change.edit*2.6.0.v20150504-0831@default:default,org.eclipse.emf.ecore.change.edit*2.6.0.v20150518-0831@default:default,org.eclipse.emf.ecore.edit*2.9.0.v20150504-0831@default:default,org.eclipse.emf.ecore.edit*2.9.0.v20150518-0831@default:default,org.eclipse.emf.ecore.editor*2.11.0.v20150504-0831@default:default,org.eclipse.emf.ecore.editor*2.11.0.v20150518-0831@default:default,org.eclipse.emf.ecore.xmi*2.11.0.v20150428-0315@default:default,org.eclipse.emf.ecore.xmi*2.11.0.v20150512-0501@default:default,org.eclipse.emf.edit*2.11.0.v20150504-0831@default:default,org.eclipse.emf.edit*2.11.0.v20150518-0831@default:default,org.eclipse.emf.edit.ui*2.11.0.v20150504-0831@default:default,org.eclipse.emf.edit.ui*2.11.0.v20150518-0831@default:default,org.eclipse.emf.example.installer*1.4.0.v20150504-0831@default:default,org.eclipse.emf.example.installer*1.4.0.v20150518-0831@default:default,org.eclipse.emf.exporter*2.7.0.v20150504-0831@default:default,org.eclipse.emf.exporter*2.7.0.v20150518-0831@default:default,org.eclipse.emf.importer*2.9.0.v20150504-0831@default:default,org.eclipse.emf.importer*2.9.0.v20150518-0831@default:default,org.eclipse.emf.importer.ecore*2.8.0.v20150504-0831@default:default,org.eclipse.emf.importer.ecore*2.8.0.v20150518-0831@default:default,org.eclipse.emf.importer.java*2.7.0.v20150504-0831@default:default,org.eclipse.emf.importer.java*2.7.0.v20150518-0831@default:default,org.eclipse.emf.importer.rose*2.8.0.v20150504-0831@default:default,org.eclipse.emf.importer.rose*2.8.0.v20150518-0831@default:default,org.eclipse.emf.mapping*2.9.0.v20150504-0831@default:default,org.eclipse.emf.mapping*2.9.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore*2.6.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore*2.6.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore.editor*2.6.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore.editor*2.6.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2ecore*2.9.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2ecore*2.9.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2ecore.editor*2.7.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2ecore.editor*2.7.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2xml*2.9.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2xml*2.9.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ecore2xml.ui*2.8.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ecore2xml.ui*2.8.0.v20150518-0831@default:default,org.eclipse.emf.mapping.ui*2.7.0.v20150504-0831@default:default,org.eclipse.emf.mapping.ui*2.7.0.v20150518-0831@default:default,org.eclipse.emf.mwe.core*1.3.10.v201503240644@default:default,org.eclipse.emf.mwe.core*1.3.10.v201505050723@default:default,org.eclipse.emf.mwe.utils*1.3.10.v201503240644@default:default,org.eclipse.emf.mwe.utils*1.3.10.v201505050723@default:default,org.eclipse.emf.mwe2.language*2.8.0.v201503240833@default:default,org.eclipse.emf.mwe2.language*2.8.0.v201505050939@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.launch*2.8.0.v201503240833@default:default,org.eclipse.emf.mwe2.launch*2.8.0.v201505050939@default:default,org.eclipse.emf.mwe2.lib*2.8.0.v201503240644@default:default,org.eclipse.emf.mwe2.lib*2.8.0.v201505050723@default:default,org.eclipse.emf.mwe2.runtime*2.8.0.v201503240644@default:default,org.eclipse.emf.mwe2.runtime*2.8.0.v201505050723@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction*1.9.0.201503250534@default:default,org.eclipse.emf.transaction*1.9.0.201505060251@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui*1.4.0.201503250534@default:default,org.eclipse.emf.transaction.ui*1.4.0.201505060251@default:default,org.eclipse.emf.validation*1.8.0.201503250348@default:default,org.eclipse.emf.validation*1.8.0.201505060134@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl*1.4.0.201503250348@default:default,org.eclipse.emf.validation.ocl*1.4.0.201505060134@default:default,org.eclipse.emf.validation.ui*1.7.0.201503250348@default:default,org.eclipse.emf.validation.ui*1.7.0.201505060134@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.workspace*1.5.1.201503250534@default:default,org.eclipse.emf.workspace*1.5.1.201505060251@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui*1.3.0.201503250534@default:default,org.eclipse.emf.workspace.ui*1.3.0.201505060251@default:default,org.eclipse.epp.logging.aeri.ui@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app*1.3.200.v20130910-1609@default:default,org.eclipse.equinox.app*1.3.300.v20150423-1356@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common*3.7.0.v20150318-1503@2:true,org.eclipse.equinox.common*3.7.0.v20150402-1709@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds*1.4.200.v20131126-2331@1:true,org.eclipse.equinox.ds*1.4.300.v20150423-1356@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin*2.0.100.v20131209-2144@default:default,org.eclipse.equinox.frameworkadmin*2.0.200.v20150423-1455@default:default,org.eclipse.equinox.frameworkadmin.equinox*1.0.500.v20150304-1709@default:default,org.eclipse.equinox.frameworkadmin.equinox*1.0.600.v20150427-1907@default:default,org.eclipse.equinox.http.jetty*3.1.0.v20150319-1742@default:default,org.eclipse.equinox.http.jetty*3.1.0.v20150323-1312@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet*1.2.0.v20150319-1742@default:default,org.eclipse.equinox.http.servlet*1.2.0.v20150428-1940@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher*1.3.0.v20140415-2008@default:default,org.eclipse.equinox.launcher*1.3.100.v20150511-1540@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64*1.1.200.v20150320-0346@default:false,org.eclipse.equinox.launcher.win32.win32.x86_64*1.1.300.v20150513-1722@default:false,org.eclipse.equinox.p2.artifact.repository*1.1.300.v20150226-1713@default:default,org.eclipse.equinox.p2.artifact.repository*1.1.400.v20150513-2116@default:default,org.eclipse.equinox.p2.console*1.0.300.v20150226-1713@default:default,org.eclipse.equinox.p2.console*1.0.400.v20150423-1455@default:default,org.eclipse.equinox.p2.core*2.4.0.v20150226-1713@default:default,org.eclipse.equinox.p2.core*2.4.0.v20150424-1429@default:default,org.eclipse.equinox.p2.director*2.3.100.v20150226-1713@default:default,org.eclipse.equinox.p2.director*2.3.200.v20150423-1455@default:default,org.eclipse.equinox.p2.director.app*1.0.300.v20150308-0324@default:default,org.eclipse.equinox.p2.director.app*1.0.400.v20150423-1455@default:default,org.eclipse.equinox.p2.directorywatcher*1.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.directorywatcher*1.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine*2.3.0.v20150226-1713@default:default,org.eclipse.equinox.p2.engine*2.4.0.v20150511-1532@default:default,org.eclipse.equinox.p2.extensionlocation*1.2.100.v20150226-1713@default:default,org.eclipse.equinox.p2.extensionlocation*1.2.200.v20150423-1455@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor*1.0.300.v20131211-1531@default:default,org.eclipse.equinox.p2.jarprocessor*1.0.400.v20150430-1836@default:default,org.eclipse.equinox.p2.metadata*2.2.0.v20150216-2211@default:default,org.eclipse.equinox.p2.metadata*2.3.0.v20150511-1532@default:default,org.eclipse.equinox.p2.metadata.repository*1.2.100.v20150226-1713@default:default,org.eclipse.equinox.p2.metadata.repository*1.2.200.v20150428-1613@default:default,org.eclipse.equinox.p2.operations*2.4.0.v20150226-1713@default:default,org.eclipse.equinox.p2.operations*2.4.100.v20150423-1455@default:default,org.eclipse.equinox.p2.publisher.eclipse*1.1.200.v20150319-1551@default:default,org.eclipse.equinox.p2.publisher.eclipse*1.1.300.v20150423-1455@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins*1.1.200.v20150226-1713@default:default,org.eclipse.equinox.p2.reconciler.dropins*1.1.300.v20150423-1455@default:default,org.eclipse.equinox.p2.repository*2.3.0.v20150311-0407@default:default,org.eclipse.equinox.p2.repository*2.3.100.v20150428-1613@default:default,org.eclipse.equinox.p2.repository.tools*2.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.repository.tools*2.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.touchpoint.eclipse*2.1.200.v20150304-1709@default:default,org.eclipse.equinox.p2.touchpoint.eclipse*2.1.300.v20150423-1455@default:default,org.eclipse.equinox.p2.touchpoint.natives*1.2.0.v20150226-1713@default:default,org.eclipse.equinox.p2.touchpoint.natives*1.2.0.v20150424-1456@default:default,org.eclipse.equinox.p2.transport.ecf*1.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.transport.ecf*1.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.ui*2.4.0.v20150226-1713@default:default,org.eclipse.equinox.p2.ui*2.4.0.v20150425-0422@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport*1.1.0.v20150226-1713@default:default,org.eclipse.equinox.p2.ui.importexport*1.1.100.v20150423-1455@default:default,org.eclipse.equinox.p2.ui.sdk*1.0.300.v20140407-1803@default:default,org.eclipse.equinox.p2.ui.sdk*1.0.400.v20150423-1455@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler*1.2.0.v20150226-1713@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler*1.2.100.v20150423-1455@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite*1.0.400.v20150224-1702@default:default,org.eclipse.equinox.p2.updatesite*1.0.500.v20150423-1455@default:default,org.eclipse.equinox.preferences*3.5.300.v20150313-2125@default:default,org.eclipse.equinox.preferences*3.5.300.v20150408-1437@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security*1.2.0.v20150223-1455@default:default,org.eclipse.equinox.security*1.2.100.v20150423-1356@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.simpleconfigurator*1.1.0.v20131217-1203@1:true,org.eclipse.equinox.simpleconfigurator*1.1.100.v20150423-1455@1:true,org.eclipse.equinox.simpleconfigurator.manipulator*2.0.0.v20150121-1551@default:default,org.eclipse.equinox.simpleconfigurator.manipulator*2.0.100.v20150423-1455@default:default,org.eclipse.equinox.util@default:default,org.eclipse.gef*3.10.0.201505040206@default:default,org.eclipse.gef*3.10.0.201505170205@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui*1.8.1.201503261653@default:default,org.eclipse.gmf.runtime.common.ui*1.8.1.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.action*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.action*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.action.ide*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.action.ide*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.printing*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.printing*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.services*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.services*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.services.action*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.services.action*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.common.ui.services.properties*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui*1.8.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui*1.8.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.actions*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.actions*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.printing*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render*1.8.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render*1.8.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.properties*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.properties*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.providers*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.providers*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.render*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.render*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.draw2d.ui*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.draw2d.ui*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.draw2d.ui.render*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.draw2d.ui.render*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt*1.8.0.201503261653@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt*1.8.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.clipboard.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.clipboard.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.commands.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.commands.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.core*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.core*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.type.core*1.9.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.type.core*1.9.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.ui*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.emf.ui.properties*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.emf.ui.properties*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.gef.ui*1.7.0.201503261653@default:default,org.eclipse.gmf.runtime.gef.ui*1.7.0.201505060429@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation*1.8.0.201503250354@default:default,org.eclipse.gmf.runtime.notation*1.8.0.201505060039@default:default,org.eclipse.gmf.runtime.notation.edit*1.7.0.201503250354@default:default,org.eclipse.gmf.runtime.notation.edit*1.7.0.201505060039@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime*3.2.0.201412171959@default:default,org.eclipse.gmf.tooling.runtime*3.2.0.201505032108@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base*4.0.300.v20150320-0800@default:default,org.eclipse.help.base*4.0.300.v20150514-1000@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp*3.7.0.v20150226-2129@default:default,org.eclipse.help.webapp*3.7.0.v20150425-0643@default:default,org.eclipse.help@default:default,org.eclipse.jdt*3.11.0.v20150430-1445@default:default,org.eclipse.jdt*3.11.0.v20150514-1000@default:default,org.eclipse.jdt.annotation*1.1.100.v20140704-0625@default:default,org.eclipse.jdt.annotation*2.0.100.v20150311-1658@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt*1.2.0.v20150424-1830@default:false,org.eclipse.jdt.compiler.apt*1.2.0.v20150514-0146@default:false,org.eclipse.jdt.compiler.tool*1.1.0.v20150423-0947@default:false,org.eclipse.jdt.compiler.tool*1.1.0.v20150513-2007@default:false,org.eclipse.jdt.core*3.11.0.v20150429-0810@default:default,org.eclipse.jdt.core*3.11.0.v20150513-2030@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.debug.ui*3.7.0.v20150414-0909@default:default,org.eclipse.jdt.debug.ui*3.7.0.v20150505-1916@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv*3.11.0.v20150401-1527@default:default,org.eclipse.jdt.doc.isv*3.11.0.v20150513-1616@default:default,org.eclipse.jdt.doc.user*3.11.0.v20150429-1030@default:default,org.eclipse.jdt.doc.user*3.11.0.v20150513-1723@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui*3.11.0.v20150428-1805@default:default,org.eclipse.jdt.ui*3.11.0.v20150513-1857@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface*3.11.0.v20150313-1544@default:default,org.eclipse.jface*3.11.0.v20150511-1340@default:default,org.eclipse.jface.databinding*1.7.0.v20150315-0701@default:default,org.eclipse.jface.databinding*1.7.0.v20150406-2148@default:default,org.eclipse.jface.text*3.10.0.v20150112-1146@default:default,org.eclipse.jface.text*3.10.0.v20150428-1301@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.java7@default:false,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml*3.5.0.v20150324-1740@default:default,org.eclipse.m2m.qvt.oml*3.5.0.v20150505-0519@default:default,org.eclipse.m2m.qvt.oml.common*3.5.0.v20150224-1209@default:default,org.eclipse.m2m.qvt.oml.common*3.5.0.v20150429-1352@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util*3.5.0.v20150129-1251@default:default,org.eclipse.m2m.qvt.oml.emf.util*3.5.0.v20150419-1233@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime*3.5.0.v20150324-1740@default:default,org.eclipse.m2m.qvt.oml.runtime*3.5.0.v20150505-0519@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ide@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.help.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.pde.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.bugs@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.ocl*3.5.0.v20150321-0925@default:default,org.eclipse.ocl*3.5.0.v20150410-1135@default:default,org.eclipse.ocl.common.ui*1.2.0.v20140819-1517@default:default,org.eclipse.ocl.common.ui*1.2.0.v20150410-1119@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore*3.3.200.v20150110-2335@default:default,org.eclipse.ocl.ecore*3.3.200.v20150330-1704@default:default,org.eclipse.ocl.examples.debug*2.0.0.v20150208-1848@default:default,org.eclipse.ocl.examples.debug*2.0.0.v20150410-1125@default:default,org.eclipse.ocl.examples.debug.vm*2.0.0.v20150208-2149@default:default,org.eclipse.ocl.examples.debug.vm*2.0.0.v20150410-1125@default:default,org.eclipse.ocl.examples.ui*1.3.0.v20141108-1747@default:default,org.eclipse.ocl.examples.ui*1.3.0.v20150410-1125@default:default,org.eclipse.ocl.examples.xtext.console*4.0.0.v20150208-1844@default:default,org.eclipse.ocl.examples.xtext.console*4.0.0.v20150424-1841@default:default,org.eclipse.ocl.jdt.annotation7@default:default,org.eclipse.ocl.pivot*1.0.0.v20150323-1850@default:default,org.eclipse.ocl.pivot*1.0.0.v20150504-1704@default:default,org.eclipse.ocl.pivot.ui*1.0.0.v20150122-1254@default:default,org.eclipse.ocl.pivot.ui*1.0.0.v20150410-1125@default:default,org.eclipse.ocl.pivot.uml*1.0.0.v20150317-1133@default:default,org.eclipse.ocl.pivot.uml*1.0.0.v20150416-1648@default:default,org.eclipse.ocl.xtext.base*1.0.0.v20150320-1757@default:default,org.eclipse.ocl.xtext.base*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.base.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.base.ui*1.0.0.v20150503-2043@default:default,org.eclipse.ocl.xtext.completeocl*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.completeocl*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.completeocl.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.completeocl.ui*1.0.0.v20150424-1832@default:default,org.eclipse.ocl.xtext.essentialocl*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.essentialocl*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.essentialocl.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.essentialocl.ui*1.0.0.v20150410-1232@default:default,org.eclipse.ocl.xtext.markup*1.0.0.v20150320-1757@default:default,org.eclipse.ocl.xtext.markup*1.0.0.v20150429-2115@default:default,org.eclipse.ocl.xtext.markup.ui*1.0.0.v20150226-1501@default:default,org.eclipse.ocl.xtext.markup.ui*1.0.0.v20150410-1125@default:default,org.eclipse.ocl.xtext.oclinecore*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclinecore*1.0.0.v20150429-2115@default:default,org.eclipse.ocl.xtext.oclinecore.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclinecore.ui*1.0.0.v20150503-1711@default:default,org.eclipse.ocl.xtext.oclstdlib*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclstdlib*1.0.0.v20150429-2115@default:default,org.eclipse.ocl.xtext.oclstdlib.ui*1.0.0.v20150323-1849@default:default,org.eclipse.ocl.xtext.oclstdlib.ui*1.0.0.v20150424-1832@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo.win32.x86_64@default:false,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.projectcopy@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.osgi*3.10.100.v20150318-0312@-1:true,org.eclipse.osgi*3.10.100.v20150420-1253@-1:true,org.eclipse.osgi.compatibility.state*1.0.100.v20140702-1948@default:false,org.eclipse.osgi.compatibility.state*1.0.100.v20150402-1551@default:false,org.eclipse.osgi.services*3.5.0.v20150225-1427@default:default,org.eclipse.osgi.services*3.5.0.v20150428-1938@default:default,org.eclipse.osgi.util*3.3.0.v20131023-1243@default:default,org.eclipse.osgi.util*3.3.100.v20150423-1351@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc*1.1.0.201505061653@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc*1.1.0.201505201124@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc*1.1.0.201505061653@default:default,org.eclipse.papyrus.emf.facet.efacet.doc*1.1.0.201505201124@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc*1.1.0.201505061653@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc*1.1.0.201505201124@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync*1.1.0.201505061653@default:default,org.eclipse.papyrus.infra.sync*1.1.0.201505201124@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries*1.1.0.201505061653@default:default,org.eclipse.papyrus.uml.alf.libraries*1.1.0.201505201124@default:default,org.eclipse.papyrus.uml.alf.to.fuml*1.1.0.201505061653@default:default,org.eclipse.papyrus.uml.alf.to.fuml*1.1.0.201505201124@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.elementtypesconfigurations@default:default,org.eclipse.papyrus.uml.elementtypesconfigurations@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.papyrus.views.validation@default:default,org.eclipse.pde*3.11.0.v20150430-1445@default:default,org.eclipse.pde*3.11.0.v20150514-1000@default:default,org.eclipse.pde.api.tools*1.0.700.v20150424-1421@default:default,org.eclipse.pde.api.tools*1.0.700.v20150513-0819@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ee.cdcfoundation10@default:false,org.eclipse.pde.api.tools.ee.cdcfoundation11@default:false,org.eclipse.pde.api.tools.ee.j2se12@default:false,org.eclipse.pde.api.tools.ee.j2se13@default:false,org.eclipse.pde.api.tools.ee.j2se14@default:false,org.eclipse.pde.api.tools.ee.j2se15@default:false,org.eclipse.pde.api.tools.ee.javase16@default:false,org.eclipse.pde.api.tools.ee.javase17@default:false,org.eclipse.pde.api.tools.ee.javase18@default:false,org.eclipse.pde.api.tools.ee.jre11@default:false,org.eclipse.pde.api.tools.ee.osgiminimum10@default:false,org.eclipse.pde.api.tools.ee.osgiminimum11@default:false,org.eclipse.pde.api.tools.ee.osgiminimum12@default:false,org.eclipse.pde.api.tools.ui*1.0.600.v20150428-1008@default:default,org.eclipse.pde.api.tools.ui*1.0.600.v20150513-0819@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user*3.11.0.v20150401-1527@default:default,org.eclipse.pde.doc.user*3.11.0.v20150513-1616@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui*1.0.400.v20150428-1008@default:default,org.eclipse.pde.ds.ui*1.0.400.v20150506-1709@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui*1.0.400.v20150427-1238@default:default,org.eclipse.pde.ua.ui*1.0.400.v20150513-1136@default:default,org.eclipse.pde.ui*3.8.200.v20150428-1042@default:default,org.eclipse.pde.ui*3.8.200.v20150513-0844@default:default,org.eclipse.pde.ui.templates*3.5.0.v20150421-1428@default:default,org.eclipse.pde.ui.templates*3.5.0.v20150506-2103@default:default,org.eclipse.platform*4.5.0.v20150320-0800@default:default,org.eclipse.platform*4.5.0.v20150514-1000@default:default,org.eclipse.platform.doc.isv*4.5.0.v20150318-1609@default:default,org.eclipse.platform.doc.isv*4.5.0.v20150513-1616@default:default,org.eclipse.platform.doc.user*4.5.0.v20150213-0817@default:default,org.eclipse.platform.doc.user*4.5.0.v20150324-0903@default:default,org.eclipse.rcp*4.5.0.v20150320-0800@default:default,org.eclipse.rcp*4.5.0.v20150514-1000@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt*3.104.0.v20150319-1901@default:default,org.eclipse.swt*3.104.0.v20150513-1901@default:default,org.eclipse.swt.tools@default:default,org.eclipse.swt.win32.win32.x86_64*3.104.0.v20150319-1901@default:false,org.eclipse.swt.win32.win32.x86_64*3.104.0.v20150513-1901@default:false,org.eclipse.swtbot.e4.finder@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.eclipse.gef.finder@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.generator.jdt@default:default,org.eclipse.swtbot.generator.rules.workbench@default:default,org.eclipse.swtbot.generator.ui@default:default,org.eclipse.swtbot.generator@default:default,org.eclipse.swtbot.go@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text*3.5.400.v20140915-2351@default:default,org.eclipse.text*3.5.400.v20150505-1044@default:default,org.eclipse.ui*3.107.0.v20150315-0703@default:default,org.eclipse.ui*3.107.0.v20150507-1945@default:default,org.eclipse.ui.browser*3.4.300.v20150315-1252@default:default,org.eclipse.ui.browser*3.4.300.v20150429-0602@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console*3.6.0.v20150310-1028@default:default,org.eclipse.ui.console*3.6.0.v20150512-1341@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms*3.6.200.v20150315-1254@default:default,org.eclipse.ui.forms*3.6.200.v20150506-2029@default:default,org.eclipse.ui.ide*3.11.0.v20150309-2044@default:default,org.eclipse.ui.ide*3.11.0.v20150510-1749@default:default,org.eclipse.ui.ide.application*1.0.600.v20150315-1254@default:default,org.eclipse.ui.ide.application*1.1.0.v20150422-0725@default:default,org.eclipse.ui.intro.universal*3.2.800.v20150317-1532@default:default,org.eclipse.ui.intro.universal*3.2.800.v20150325-0952@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring*1.0.0.v20150228-1728@default:default,org.eclipse.ui.monitoring*1.0.0.v20150512-1436@default:default,org.eclipse.ui.navigator*3.5.500.v20150315-1254@default:default,org.eclipse.ui.navigator*3.6.0.v20150422-0725@default:default,org.eclipse.ui.navigator.resources*3.4.800.v20150315-1254@default:default,org.eclipse.ui.navigator.resources*3.5.0.v20150422-0725@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes*1.1.0.v20150313-1033@default:default,org.eclipse.ui.themes*1.1.0.v20150511-0913@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views*3.7.100.v20150316-1432@default:default,org.eclipse.ui.views*3.8.0.v20150422-0725@default:default,org.eclipse.ui.views.log*1.0.600.v20141222-0829@default:default,org.eclipse.ui.views.log*1.0.600.v20150513-1840@default:default,org.eclipse.ui.views.properties.tabbed*3.6.0.v20150315-1254@default:default,org.eclipse.ui.views.properties.tabbed*3.6.100.v20150423-0822@default:default,org.eclipse.ui.win32*3.2.400.v20150315-1253@default:false,org.eclipse.ui.win32*3.2.500.v20150423-0822@default:false,org.eclipse.ui.workbench*3.107.0.v20150318-2200@default:default,org.eclipse.ui.workbench*3.107.0.v20150510-1732@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.uml2*5.0.0.v20150504-0916@default:default,org.eclipse.uml2*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.ant*1.0.0.v20150504-0916@default:default,org.eclipse.uml2.ant*1.0.0.v20150518-2047@default:default,org.eclipse.uml2.codegen.ecore*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.codegen.ecore*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.codegen.ecore.ui*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.codegen.ecore.ui*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.common*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.common*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.common.edit*2.1.0.v20150504-0916@default:default,org.eclipse.uml2.common.edit*2.1.0.v20150518-2047@default:default,org.eclipse.uml2.doc*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.doc*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.examples*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.examples*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.examples.uml.ui*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.examples.uml.ui*5.0.0.v20150518-2047@default:default,org.eclipse.uml2.types*2.0.0.v20150504-0916@default:default,org.eclipse.uml2.types*2.0.0.v20150518-2047@default:default,org.eclipse.uml2.uml*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.ecore.exporter*3.0.0.v20150504-0916@default:default,org.eclipse.uml2.uml.ecore.exporter*3.0.0.v20150518-2047@default:default,org.eclipse.uml2.uml.ecore.importer*3.0.0.v20150504-0916@default:default,org.eclipse.uml2.uml.ecore.importer*3.0.0.v20150518-2047@default:default,org.eclipse.uml2.uml.edit*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml.edit*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.editor*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml.editor*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.profile.standard*1.0.100.v20150504-0916@default:default,org.eclipse.uml2.uml.profile.standard*1.0.100.v20150518-2047@default:default,org.eclipse.uml2.uml.resources*5.1.0.v20150504-0916@default:default,org.eclipse.uml2.uml.resources*5.1.0.v20150518-2047@default:default,org.eclipse.uml2.uml.validation*5.0.0.v20150504-0916@default:default,org.eclipse.uml2.uml.validation*5.0.0.v20150518-2047@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver*1.2.100.v201305141634@default:default,org.eclipse.wst.common.uriresolver*1.2.100.v201504151458@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand*2.1.0.v201503240650@default:default,org.eclipse.xpand*2.1.0.v201505051058@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend*2.1.0.v201503240650@default:default,org.eclipse.xtend*2.1.0.v201505051058@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf*2.1.0.v201503240650@default:default,org.eclipse.xtend.typesystem.emf*2.1.0.v201505051058@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.junit@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.junit@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.jacoco.agent@default:default,org.jacoco.core@default:default,org.jacoco.report@default:default,org.jsoup@default:default,org.junit@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.customization.extendedtypes.emf@default:default,org.eclipse.papyrus.customization.extendedtypes.uml@default:default,org.eclipse.papyrus.customization.extendedtypes@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties.tests@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.doc@default:default,org.eclipse.papyrus.domaincodegen.ui@default:default,org.eclipse.papyrus.domaincontextcodegen.edit@default:default,org.eclipse.papyrus.domaincontextcodegen.editor@default:default,org.eclipse.papyrus.domaincontextcodegen@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:false,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.edit@default:default,org.eclipse.papyrus.infra.core.serviceregistry.editor@default:default,org.eclipse.papyrus.infra.core.serviceregistry.tests@default:false,org.eclipse.papyrus.infra.core.serviceregistry@default:default,org.eclipse.papyrus.infra.core.tests@default:false,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.editor@default:default,org.eclipse.papyrus.infra.emf.embeddededitor@default:default,org.eclipse.papyrus.infra.emf.facet.queries@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.newchild@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:false,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:false,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.edit@default:default,org.eclipse.papyrus.infra.extendedtypes.editor@default:default,org.eclipse.papyrus.infra.extendedtypes.elementtypeview@default:default,org.eclipse.papyrus.infra.extendedtypes.emf@default:default,org.eclipse.papyrus.infra.extendedtypes.tests@default:default,org.eclipse.papyrus.infra.extendedtypes@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:false,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.palette@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:false,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.preferences@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:false,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.edit@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.editor@default:default,org.eclipse.papyrus.infra.viewpoints.configuration@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010.edit@default:default,org.eclipse.papyrus.infra.viewpoints.iso42010@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.viewpoints.preferences@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.moka.doc@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.tools@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.search.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:false,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:false,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:false,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:false,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.emftree@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:false,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:false,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:false,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.uml.textedit.doc@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.textual.editors.example@default:default,org.eclipse.papyrus.uml.elementtypesconfigurations@default:default,org.eclipse.papyrus.uml.tools.extendedtypes@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.ui.perspectiveconfiguration@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="false"/>